[Android] TV : Use correct shuffle and repeat audio buttons

[Alexandre Perraud]

vlc-ports/android | branch: master | Alexandre Perraud <4leyx4ndre at gmail.com> | Fri Apr 10 16:36:45 2015 +0200| [0ccfbf46f90fd1a30b6ec09bfbeeae86af92c117] | committer: Alexandre Perraud

TV : Use correct shuffle and repeat audio buttons

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=0ccfbf46f90fd1a30b6ec09bfbeeae86af92c117
---

 vlc-android/tv/res/drawable-hdpi/ic_repeat_grey600_36dp.png  |  Bin 410 -> 0 bytes
 .../tv/res/drawable-hdpi/ic_repeat_one_white_36dp.png        |  Bin 469 -> 0 bytes
 vlc-android/tv/res/drawable-hdpi/ic_shuffle_grey600_36dp.png |  Bin 468 -> 0 bytes
 vlc-android/tv/res/drawable-hdpi/ic_shuffle_white_36dp.png   |  Bin 477 -> 0 bytes
 vlc-android/tv/res/drawable-mdpi/ic_repeat_grey600_36dp.png  |  Bin 297 -> 0 bytes
 .../tv/res/drawable-mdpi/ic_repeat_one_white_36dp.png        |  Bin 318 -> 0 bytes
 vlc-android/tv/res/drawable-mdpi/ic_shuffle_grey600_36dp.png |  Bin 405 -> 0 bytes
 vlc-android/tv/res/drawable-mdpi/ic_shuffle_white_36dp.png   |  Bin 413 -> 0 bytes
 vlc-android/tv/res/drawable-xhdpi/ic_repeat_grey600_36dp.png |  Bin 400 -> 0 bytes
 .../tv/res/drawable-xhdpi/ic_repeat_one_white_36dp.png       |  Bin 422 -> 0 bytes
 .../tv/res/drawable-xhdpi/ic_shuffle_grey600_36dp.png        |  Bin 614 -> 0 bytes
 vlc-android/tv/res/drawable-xhdpi/ic_shuffle_white_36dp.png  |  Bin 627 -> 0 bytes
 .../tv/res/drawable-xxhdpi/ic_repeat_grey600_36dp.png        |  Bin 573 -> 0 bytes
 .../tv/res/drawable-xxhdpi/ic_repeat_one_white_36dp.png      |  Bin 620 -> 0 bytes
 .../tv/res/drawable-xxhdpi/ic_shuffle_grey600_36dp.png       |  Bin 818 -> 0 bytes
 vlc-android/tv/res/drawable-xxhdpi/ic_shuffle_white_36dp.png |  Bin 786 -> 0 bytes
 .../tv/res/drawable-xxxhdpi/ic_repeat_grey600_36dp.png       |  Bin 672 -> 0 bytes
 .../tv/res/drawable-xxxhdpi/ic_repeat_one_white_36dp.png     |  Bin 717 -> 0 bytes
 .../tv/res/drawable-xxxhdpi/ic_shuffle_grey600_36dp.png      |  Bin 1057 -> 0 bytes
 .../tv/res/drawable-xxxhdpi/ic_shuffle_white_36dp.png        |  Bin 1056 -> 0 bytes
 vlc-android/tv/res/layout/tv_audio_player.xml                |    4 ++--
 .../videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java |   10 +++++-----
 22 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/vlc-android/tv/res/drawable-hdpi/ic_repeat_grey600_36dp.png b/vlc-android/tv/res/drawable-hdpi/ic_repeat_grey600_36dp.png
deleted file mode 100644
index faff89c..0000000
Binary files a/vlc-android/tv/res/drawable-hdpi/ic_repeat_grey600_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-hdpi/ic_repeat_one_white_36dp.png b/vlc-android/tv/res/drawable-hdpi/ic_repeat_one_white_36dp.png
deleted file mode 100644
index 9677898..0000000
Binary files a/vlc-android/tv/res/drawable-hdpi/ic_repeat_one_white_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-hdpi/ic_shuffle_grey600_36dp.png b/vlc-android/tv/res/drawable-hdpi/ic_shuffle_grey600_36dp.png
deleted file mode 100644
index 82ffeee..0000000
Binary files a/vlc-android/tv/res/drawable-hdpi/ic_shuffle_grey600_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-hdpi/ic_shuffle_white_36dp.png b/vlc-android/tv/res/drawable-hdpi/ic_shuffle_white_36dp.png
deleted file mode 100644
index 3a0c8dc..0000000
Binary files a/vlc-android/tv/res/drawable-hdpi/ic_shuffle_white_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-mdpi/ic_repeat_grey600_36dp.png b/vlc-android/tv/res/drawable-mdpi/ic_repeat_grey600_36dp.png
deleted file mode 100644
index 48d6ce9..0000000
Binary files a/vlc-android/tv/res/drawable-mdpi/ic_repeat_grey600_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-mdpi/ic_repeat_one_white_36dp.png b/vlc-android/tv/res/drawable-mdpi/ic_repeat_one_white_36dp.png
deleted file mode 100644
index d2f5345..0000000
Binary files a/vlc-android/tv/res/drawable-mdpi/ic_repeat_one_white_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-mdpi/ic_shuffle_grey600_36dp.png b/vlc-android/tv/res/drawable-mdpi/ic_shuffle_grey600_36dp.png
deleted file mode 100644
index ad56bb9..0000000
Binary files a/vlc-android/tv/res/drawable-mdpi/ic_shuffle_grey600_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-mdpi/ic_shuffle_white_36dp.png b/vlc-android/tv/res/drawable-mdpi/ic_shuffle_white_36dp.png
deleted file mode 100644
index 4ad8a56..0000000
Binary files a/vlc-android/tv/res/drawable-mdpi/ic_shuffle_white_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-xhdpi/ic_repeat_grey600_36dp.png b/vlc-android/tv/res/drawable-xhdpi/ic_repeat_grey600_36dp.png
deleted file mode 100644
index 6a89061..0000000
Binary files a/vlc-android/tv/res/drawable-xhdpi/ic_repeat_grey600_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-xhdpi/ic_repeat_one_white_36dp.png b/vlc-android/tv/res/drawable-xhdpi/ic_repeat_one_white_36dp.png
deleted file mode 100644
index 36ea532..0000000
Binary files a/vlc-android/tv/res/drawable-xhdpi/ic_repeat_one_white_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-xhdpi/ic_shuffle_grey600_36dp.png b/vlc-android/tv/res/drawable-xhdpi/ic_shuffle_grey600_36dp.png
deleted file mode 100644
index a079e10..0000000
Binary files a/vlc-android/tv/res/drawable-xhdpi/ic_shuffle_grey600_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-xhdpi/ic_shuffle_white_36dp.png b/vlc-android/tv/res/drawable-xhdpi/ic_shuffle_white_36dp.png
deleted file mode 100644
index 5b3d814..0000000
Binary files a/vlc-android/tv/res/drawable-xhdpi/ic_shuffle_white_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-xxhdpi/ic_repeat_grey600_36dp.png b/vlc-android/tv/res/drawable-xxhdpi/ic_repeat_grey600_36dp.png
deleted file mode 100644
index d2dbd79..0000000
Binary files a/vlc-android/tv/res/drawable-xxhdpi/ic_repeat_grey600_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-xxhdpi/ic_repeat_one_white_36dp.png b/vlc-android/tv/res/drawable-xxhdpi/ic_repeat_one_white_36dp.png
deleted file mode 100644
index 65738f4..0000000
Binary files a/vlc-android/tv/res/drawable-xxhdpi/ic_repeat_one_white_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-xxhdpi/ic_shuffle_grey600_36dp.png b/vlc-android/tv/res/drawable-xxhdpi/ic_shuffle_grey600_36dp.png
deleted file mode 100644
index 24d34b4..0000000
Binary files a/vlc-android/tv/res/drawable-xxhdpi/ic_shuffle_grey600_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-xxhdpi/ic_shuffle_white_36dp.png b/vlc-android/tv/res/drawable-xxhdpi/ic_shuffle_white_36dp.png
deleted file mode 100644
index b4bc230..0000000
Binary files a/vlc-android/tv/res/drawable-xxhdpi/ic_shuffle_white_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-xxxhdpi/ic_repeat_grey600_36dp.png b/vlc-android/tv/res/drawable-xxxhdpi/ic_repeat_grey600_36dp.png
deleted file mode 100644
index f0935d0..0000000
Binary files a/vlc-android/tv/res/drawable-xxxhdpi/ic_repeat_grey600_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-xxxhdpi/ic_repeat_one_white_36dp.png b/vlc-android/tv/res/drawable-xxxhdpi/ic_repeat_one_white_36dp.png
deleted file mode 100644
index 875414e..0000000
Binary files a/vlc-android/tv/res/drawable-xxxhdpi/ic_repeat_one_white_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-xxxhdpi/ic_shuffle_grey600_36dp.png b/vlc-android/tv/res/drawable-xxxhdpi/ic_shuffle_grey600_36dp.png
deleted file mode 100644
index de8e0c3..0000000
Binary files a/vlc-android/tv/res/drawable-xxxhdpi/ic_shuffle_grey600_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/drawable-xxxhdpi/ic_shuffle_white_36dp.png b/vlc-android/tv/res/drawable-xxxhdpi/ic_shuffle_white_36dp.png
deleted file mode 100644
index aaea4dc..0000000
Binary files a/vlc-android/tv/res/drawable-xxxhdpi/ic_shuffle_white_36dp.png and /dev/null differ
diff --git a/vlc-android/tv/res/layout/tv_audio_player.xml b/vlc-android/tv/res/layout/tv_audio_player.xml
index 3dd5538..2c6714a 100644
--- a/vlc-android/tv/res/layout/tv_audio_player.xml
+++ b/vlc-android/tv/res/layout/tv_audio_player.xml
@@ -85,7 +85,7 @@
 	            android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
 	            android:layout_marginRight="10dp"
-	            android:src="@drawable/ic_repeat_grey600_36dp"
+	            android:src="@drawable/ic_repeat"
 	            android:clickable="true"
 	            android:onClick="onClick"
                 android:nextFocusRight="@+id/button_previous"
@@ -134,7 +134,7 @@
 	            android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
 	            android:layout_marginLeft="10dp"
-	            android:src="@drawable/ic_shuffle_grey600_36dp"
+	            android:src="@drawable/ic_shuffle"
 	            android:clickable="true"
 	            android:onClick="onClick"
                 android:nextFocusRight="@id/playlist"
diff --git a/vlc-android/tv/src/org/videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java b/vlc-android/tv/src/org/videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java
index 6060f0e..ca956b2 100644
--- a/vlc-android/tv/src/org/videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java
+++ b/vlc-android/tv/src/org/videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java
@@ -265,8 +265,8 @@ public class AudioPlayerActivity extends Activity implements AudioServiceControl
 
     private void setShuffleMode(boolean shuffle) {
         mShuffling = shuffle;
-        mShuffle.setImageResource(shuffle ? R.drawable.ic_shuffle_white_36dp :
-                R.drawable.ic_shuffle_grey600_36dp);
+        mShuffle.setImageResource(shuffle ? R.drawable.ic_shuffle_on :
+                R.drawable.ic_shuffle);
         ArrayList<String> medialocations = (ArrayList<String>) mAudioController.getMediaLocations();
         if (shuffle){
             Collections.shuffle(medialocations);
@@ -289,13 +289,13 @@ public class AudioPlayerActivity extends Activity implements AudioServiceControl
         RepeatType type = mAudioController.getRepeatType();
         if (type == RepeatType.None){
             mAudioController.setRepeatType(RepeatType.All);
-            mRepeat.setImageResource(R.drawable.ic_repeat_white_36dp);
+            mRepeat.setImageResource(R.drawable.ic_repeat_on);
         } else if (type == RepeatType.All) {
             mAudioController.setRepeatType(RepeatType.Once);
-            mRepeat.setImageResource(R.drawable.ic_repeat_one_white_36dp);
+            mRepeat.setImageResource(R.drawable.ic_repeat_one);
         } else if (type == RepeatType.Once) {
             mAudioController.setRepeatType(RepeatType.None);
-            mRepeat.setImageResource(R.drawable.ic_repeat_grey600_36dp);
+            mRepeat.setImageResource(R.drawable.ic_repeat);
         }
     }