[Android] Repeat : cosmetic renaming

[Alexandre Perraud]

vlc-android | branch: master | Alexandre Perraud <4leyx4ndre at gmail.com> | Mon Apr 11 14:42:09 2016 +0200| [8398214644027469acb55ad55a40a5d669e17a64] | committer: Alexandre Perraud

Repeat : cosmetic renaming

> https://code.videolan.org/videolan/vlc-android/commit/8398214644027469acb55ad55a40a5d669e17a64
---

 vlc-android/res/drawable/{ic_repeat_on.xml => ic_repeat_all.xml}      | 0
 vlc-android/res/values/attrs.xml                                      | 2 +-
 vlc-android/res/values/styles.xml                                     | 4 ++--
 vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java           | 2 +-
 vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java    | 4 ++--
 .../src/org/videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java  | 2 +-
 vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java   | 2 ++
 7 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/vlc-android/res/drawable/ic_repeat_on.xml b/vlc-android/res/drawable/ic_repeat_all.xml
similarity index 100%
rename from vlc-android/res/drawable/ic_repeat_on.xml
rename to vlc-android/res/drawable/ic_repeat_all.xml
diff --git a/vlc-android/res/values/attrs.xml b/vlc-android/res/values/attrs.xml
index 21bd818..338b5e0 100644
--- a/vlc-android/res/values/attrs.xml
+++ b/vlc-android/res/values/attrs.xml
@@ -35,7 +35,7 @@
     <attr name="ic_playlist" format="reference" />
     <attr name="ic_playlist_on" format="reference" />
     <attr name="ic_repeat" format="reference" />
-    <attr name="ic_repeat_on" format="reference" />
+    <attr name="ic_repeat_all" format="reference" />
     <attr name="ic_repeat_one" format="reference" />
     <attr name="ic_shuffle" format="reference" />
     <attr name="ic_shuffle_on" format="reference" />
diff --git a/vlc-android/res/values/styles.xml b/vlc-android/res/values/styles.xml
index e58a5c4..a03561a 100644
--- a/vlc-android/res/values/styles.xml
+++ b/vlc-android/res/values/styles.xml
@@ -47,7 +47,7 @@
         <item name="ic_playlist">@drawable/ic_playlist</item>
         <item name="ic_playlist_on">@drawable/ic_playlist_on</item>
         <item name="ic_repeat">@drawable/ic_repeat</item>
-        <item name="ic_repeat_on">@drawable/ic_repeat_on</item>
+        <item name="ic_repeat_all">@drawable/ic_repeat_all</item>
         <item name="ic_repeat_one">@drawable/ic_repeat_one</item>
         <item name="ic_shuffle">@drawable/ic_shuffle</item>
         <item name="ic_shuffle_on">@drawable/ic_shuffle_on</item>
@@ -136,7 +136,7 @@
         <item name="ic_playlist">@drawable/ic_playlist_w</item>
         <item name="ic_playlist_on">@drawable/ic_playlist_on</item>
         <item name="ic_repeat">@drawable/ic_repeat_w</item>
-        <item name="ic_repeat_on">@drawable/ic_repeat_on</item>
+        <item name="ic_repeat_all">@drawable/ic_repeat_all</item>
         <item name="ic_repeat_one">@drawable/ic_repeat_one</item>
         <item name="ic_shuffle">@drawable/ic_shuffle_w</item>
         <item name="ic_shuffle_on">@drawable/ic_shuffle_on</item>
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java
index dce4509..bf52f6a 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java
@@ -361,7 +361,7 @@ public class AudioPlayer extends PlaybackServiceFragment implements PlaybackServ
             break;
         default:
         case PlaybackService.REPEAT_ALL:
-            mRepeat.setImageResource(UiTools.getResourceFromAttribute(act, R.attr.ic_repeat_on));
+            mRepeat.setImageResource(UiTools.getResourceFromAttribute(act, R.attr.ic_repeat_all));
             mRepeat.setContentDescription(getResources().getString(R.string.repeat_all));
             break;
         }
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java b/vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java
index de9c8f1..3f9a8ca 100644
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java
@@ -331,7 +331,7 @@ public class AdvOptionsDialog extends DialogFragment implements View.OnClickList
                         0, 0);
                 break;
             case PlaybackService.REPEAT_ALL:
-                mRepeat.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.ic_repeat_on, 0, 0);
+                mRepeat.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.ic_repeat_all, 0, 0);
                 break;
             case PlaybackService.REPEAT_ONE:
                 mRepeat.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.ic_repeat_one, 0, 0);
@@ -347,7 +347,7 @@ public class AdvOptionsDialog extends DialogFragment implements View.OnClickList
                 break;
             case PlaybackService.REPEAT_ONE:
                 if (mService.hasPlaylist()){
-                    mRepeat.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.ic_repeat_on, 0, 0);
+                    mRepeat.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.ic_repeat_all, 0, 0);
                     mService.setRepeatType(PlaybackService.REPEAT_ALL);
                 } else {
                     mRepeat.setCompoundDrawablesWithIntrinsicBounds(0,
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java
index 63bcd8c..b527eeb 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java
@@ -345,7 +345,7 @@ public class AudioPlayerActivity extends BaseTvActivity implements PlaybackServi
         int type = mService.getRepeatType();
         if (type == PlaybackService.REPEAT_NONE){
             mService.setRepeatType(PlaybackService.REPEAT_ALL);
-            mRepeat.setImageResource(R.drawable.ic_repeat_on);
+            mRepeat.setImageResource(R.drawable.ic_repeat_all);
         } else if (type == PlaybackService.REPEAT_ALL) {
             mService.setRepeatType(PlaybackService.REPEAT_ONE);
             mRepeat.setImageResource(R.drawable.ic_repeat_one);
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index 01e2b31..d202130 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -175,6 +175,8 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
     private ImageView mPlaylistToggle;
     private RecyclerView mPlaylist;
     private PlaylistAdapter mPlaylistAdapter;
+    private ImageView mPlaylistNext;
+    private ImageView mPlaylistPrevious;
 
     private static final int SURFACE_BEST_FIT = 0;
     private static final int SURFACE_FIT_HORIZONTAL = 1;