Commit 738a77c1 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Refactore AudioListActivity into AudioListFragment

parent 96594af8
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
android:name=".gui.audio.AudioBrowserFragment" android:name=".gui.audio.AudioBrowserFragment"
android:theme="@android:style/Theme.NoTitleBar" /> android:theme="@android:style/Theme.NoTitleBar" />
<activity <activity
android:name=".gui.audio.AudioListActivity" android:name=".gui.audio.AudioListFragment"
android:theme="@style/Theme.VLC" /> android:theme="@style/Theme.VLC" />
<activity <activity
android:name=".gui.audio.AudioActivityGroup" android:name=".gui.audio.AudioActivityGroup"
......
...@@ -211,11 +211,11 @@ public class AudioBrowserFragment extends SherlockFragment implements ISortable ...@@ -211,11 +211,11 @@ public class AudioBrowserFragment extends SherlockFragment implements ISortable
String name = adapter.getGroup(groupPosition); String name = adapter.getGroup(groupPosition);
AudioListActivity audioList = new AudioListActivity(); AudioListFragment audioList = new AudioListFragment();
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putString(AudioListActivity.EXTRA_NAME, name); b.putString(AudioListFragment.EXTRA_NAME, name);
b.putString(AudioListActivity.EXTRA_NAME2, null); b.putString(AudioListFragment.EXTRA_NAME2, null);
b.putInt(AudioListActivity.EXTRA_MODE, mFlingViewGroup.getPosition()); b.putInt(AudioListFragment.EXTRA_MODE, mFlingViewGroup.getPosition());
audioList.setArguments(b); audioList.setArguments(b);
FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction(); FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
...@@ -234,11 +234,11 @@ public class AudioBrowserFragment extends SherlockFragment implements ISortable ...@@ -234,11 +234,11 @@ public class AudioBrowserFragment extends SherlockFragment implements ISortable
String name = adapter.getGroup(groupPosition); String name = adapter.getGroup(groupPosition);
String child = adapter.getChild(groupPosition, childPosition); String child = adapter.getChild(groupPosition, childPosition);
AudioListActivity audioList = new AudioListActivity(); AudioListFragment audioList = new AudioListFragment();
Bundle b = new Bundle(); Bundle b = new Bundle();
b.putString(AudioListActivity.EXTRA_NAME, name); b.putString(AudioListFragment.EXTRA_NAME, name);
b.putString(AudioListActivity.EXTRA_NAME2, child); b.putString(AudioListFragment.EXTRA_NAME2, child);
b.putInt(AudioListActivity.EXTRA_MODE, mFlingViewGroup.getPosition()); b.putInt(AudioListFragment.EXTRA_MODE, mFlingViewGroup.getPosition());
audioList.setArguments(b); audioList.setArguments(b);
FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction(); FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
......
...@@ -52,7 +52,7 @@ import android.widget.TextView; ...@@ -52,7 +52,7 @@ import android.widget.TextView;
import com.actionbarsherlock.app.SherlockListFragment; import com.actionbarsherlock.app.SherlockListFragment;
public class AudioListActivity extends SherlockListFragment { public class AudioListFragment extends SherlockListFragment {
public final static String TAG = "VLC/AudioListActivity"; public final static String TAG = "VLC/AudioListActivity";
......
...@@ -195,7 +195,7 @@ public class AudioPlayerActivity extends Activity implements IAudioPlayer { ...@@ -195,7 +195,7 @@ public class AudioPlayerActivity extends Activity implements IAudioPlayer {
} }
public void onTextClick(View view) { public void onTextClick(View view) {
Intent intent = new Intent(this, AudioListActivity.class); Intent intent = new Intent(this, AudioListFragment.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent); startActivity(intent);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment