Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Ewout ter Hoeven
VLC-Android
Commits
738a77c1
Commit
738a77c1
authored
Jun 21, 2012
by
Jean-Baptiste Kempf
Browse files
Refactore AudioListActivity into AudioListFragment
parent
96594af8
Changes
4
Hide whitespace changes
Inline
Side-by-side
vlc-android/AndroidManifest.xml
View file @
738a77c1
...
...
@@ -88,7 +88,7 @@
android:name=
".gui.audio.AudioBrowserFragment"
android:theme=
"@android:style/Theme.NoTitleBar"
/>
<activity
android:name=
".gui.audio.AudioList
Activity
"
android:name=
".gui.audio.AudioList
Fragment
"
android:theme=
"@style/Theme.VLC"
/>
<activity
android:name=
".gui.audio.AudioActivityGroup"
...
...
vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java
View file @
738a77c1
...
...
@@ -211,11 +211,11 @@ public class AudioBrowserFragment extends SherlockFragment implements ISortable
String
name
=
adapter
.
getGroup
(
groupPosition
);
AudioList
Activity
audioList
=
new
AudioList
Activity
();
AudioList
Fragment
audioList
=
new
AudioList
Fragment
();
Bundle
b
=
new
Bundle
();
b
.
putString
(
AudioList
Activity
.
EXTRA_NAME
,
name
);
b
.
putString
(
AudioList
Activity
.
EXTRA_NAME2
,
null
);
b
.
putInt
(
AudioList
Activity
.
EXTRA_MODE
,
mFlingViewGroup
.
getPosition
());
b
.
putString
(
AudioList
Fragment
.
EXTRA_NAME
,
name
);
b
.
putString
(
AudioList
Fragment
.
EXTRA_NAME2
,
null
);
b
.
putInt
(
AudioList
Fragment
.
EXTRA_MODE
,
mFlingViewGroup
.
getPosition
());
audioList
.
setArguments
(
b
);
FragmentTransaction
ft
=
getActivity
().
getSupportFragmentManager
().
beginTransaction
();
...
...
@@ -234,11 +234,11 @@ public class AudioBrowserFragment extends SherlockFragment implements ISortable
String
name
=
adapter
.
getGroup
(
groupPosition
);
String
child
=
adapter
.
getChild
(
groupPosition
,
childPosition
);
AudioList
Activity
audioList
=
new
AudioList
Activity
();
AudioList
Fragment
audioList
=
new
AudioList
Fragment
();
Bundle
b
=
new
Bundle
();
b
.
putString
(
AudioList
Activity
.
EXTRA_NAME
,
name
);
b
.
putString
(
AudioList
Activity
.
EXTRA_NAME2
,
child
);
b
.
putInt
(
AudioList
Activity
.
EXTRA_MODE
,
mFlingViewGroup
.
getPosition
());
b
.
putString
(
AudioList
Fragment
.
EXTRA_NAME
,
name
);
b
.
putString
(
AudioList
Fragment
.
EXTRA_NAME2
,
child
);
b
.
putInt
(
AudioList
Fragment
.
EXTRA_MODE
,
mFlingViewGroup
.
getPosition
());
audioList
.
setArguments
(
b
);
FragmentTransaction
ft
=
getActivity
().
getSupportFragmentManager
().
beginTransaction
();
...
...
vlc-android/src/org/videolan/vlc/gui/audio/AudioList
Activity
.java
→
vlc-android/src/org/videolan/vlc/gui/audio/AudioList
Fragment
.java
View file @
738a77c1
...
...
@@ -52,7 +52,7 @@ import android.widget.TextView;
import
com.actionbarsherlock.app.SherlockListFragment
;
public
class
AudioList
Activity
extends
SherlockListFragment
{
public
class
AudioList
Fragment
extends
SherlockListFragment
{
public
final
static
String
TAG
=
"VLC/AudioListActivity"
;
...
...
vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayerActivity.java
View file @
738a77c1
...
...
@@ -195,7 +195,7 @@ public class AudioPlayerActivity extends Activity implements IAudioPlayer {
}
public
void
onTextClick
(
View
view
)
{
Intent
intent
=
new
Intent
(
this
,
AudioList
Activity
.
class
);
Intent
intent
=
new
Intent
(
this
,
AudioList
Fragment
.
class
);
intent
.
setFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TOP
);
startActivity
(
intent
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment