[Android] Use new trash icon color variants

Alexandre Perraud git at videolan.org
Fri Aug 25 09:58:48 CEST 2017


vlc-android | branch: master | Alexandre Perraud <4leyx4ndre at gmail.com> | Thu Aug 24 18:31:27 2017 +0200| [afa9e89238e59bd06f3f8605928c79f47d9b4f2b] | committer: Alexandre Perraud

Use new trash icon color variants

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

 vlc-android/res/layout-land/equalizer.xml          | 2 +-
 vlc-android/res/layout/equalizer.xml               | 2 +-
 vlc-android/res/menu/action_mode_audio_browser.xml | 2 +-
 vlc-android/res/menu/action_mode_browser_file.xml  | 2 +-
 vlc-android/res/menu/action_mode_video.xml         | 2 +-
 vlc-android/res/menu/fragment_option_history.xml   | 2 +-
 vlc-android/res/menu/media_library.xml             | 2 +-
 vlc-android/res/values/attrs.xml                   | 2 +-
 vlc-android/res/values/styles.xml                  | 4 ++--
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/vlc-android/res/layout-land/equalizer.xml b/vlc-android/res/layout-land/equalizer.xml
index 810055c00..a748cf8bd 100644
--- a/vlc-android/res/layout-land/equalizer.xml
+++ b/vlc-android/res/layout-land/equalizer.xml
@@ -49,7 +49,7 @@
                 android:id="@+id/equalizer_delete"
                 android:layout_width="25dp"
                 android:layout_height="25dp"
-                android:src="?attr/ic_trash_small_normal"
+                android:src="?attr/ic_trash"
                 android:layout_gravity="center_vertical"/>
         </LinearLayout>
 
diff --git a/vlc-android/res/layout/equalizer.xml b/vlc-android/res/layout/equalizer.xml
index 7fa97df61..8c5c31aa2 100644
--- a/vlc-android/res/layout/equalizer.xml
+++ b/vlc-android/res/layout/equalizer.xml
@@ -50,7 +50,7 @@
                 android:id="@+id/equalizer_delete"
                 android:layout_width="25dp"
                 android:layout_height="25dp"
-                android:src="?attr/ic_trash_small_normal"
+                android:src="?attr/ic_trash"
                 android:layout_gravity="center_vertical"/>
         </LinearLayout>
 
diff --git a/vlc-android/res/menu/action_mode_audio_browser.xml b/vlc-android/res/menu/action_mode_audio_browser.xml
index 100091cef..cf9cfb3e7 100644
--- a/vlc-android/res/menu/action_mode_audio_browser.xml
+++ b/vlc-android/res/menu/action_mode_audio_browser.xml
@@ -36,7 +36,7 @@
     <item
         android:id="@+id/action_mode_audio_delete"
         android:title="@string/delete"
-        android:icon="@drawable/ic_trash_normal_w"
+        android:icon="@drawable/ic_trash_w"
         android:visible="false"
         app:showAsAction="always" />
     <group android:id="@+id/phone_only" >
diff --git a/vlc-android/res/menu/action_mode_browser_file.xml b/vlc-android/res/menu/action_mode_browser_file.xml
index 68e1ca50e..857685e18 100644
--- a/vlc-android/res/menu/action_mode_browser_file.xml
+++ b/vlc-android/res/menu/action_mode_browser_file.xml
@@ -21,7 +21,7 @@
         android:id="@+id/action_mode_file_delete"
         android:title="@string/delete"
         android:visible="false"
-        android:icon="@drawable/ic_trash_normal_w"
+        android:icon="@drawable/ic_trash_w"
         app:showAsAction="always"/>
     <item
         android:id="@+id/action_mode_file_add_playlist"
diff --git a/vlc-android/res/menu/action_mode_video.xml b/vlc-android/res/menu/action_mode_video.xml
index fa34abf84..4d6fc06a2 100644
--- a/vlc-android/res/menu/action_mode_video.xml
+++ b/vlc-android/res/menu/action_mode_video.xml
@@ -26,7 +26,7 @@
     <item
         android:id="@+id/action_video_delete"
         android:title="@string/delete"
-        android:icon="@drawable/ic_trash_normal_w"
+        android:icon="@drawable/ic_trash_w"
         android:visible="false"
         app:showAsAction="always" />
     <item
diff --git a/vlc-android/res/menu/fragment_option_history.xml b/vlc-android/res/menu/fragment_option_history.xml
index dd5c830de..e40026bdb 100644
--- a/vlc-android/res/menu/fragment_option_history.xml
+++ b/vlc-android/res/menu/fragment_option_history.xml
@@ -4,7 +4,7 @@
     <item
         android:orderInCategory="2"
         android:id="@+id/ml_menu_clean"
-        android:icon="@drawable/ic_trash_normal_w"
+        android:icon="@drawable/ic_trash_w"
         android:title="@string/clear_history"
         android:visible="false"
         vlc:showAsAction="ifRoom"/>
diff --git a/vlc-android/res/menu/media_library.xml b/vlc-android/res/menu/media_library.xml
index 4086f30e9..8021695b3 100644
--- a/vlc-android/res/menu/media_library.xml
+++ b/vlc-android/res/menu/media_library.xml
@@ -9,7 +9,7 @@
         vlc:showAsAction="always" />
     <item
         android:id="@+id/ml_menu_clean"
-        android:icon="@drawable/ic_trash_normal_w"
+        android:icon="@drawable/ic_trash_w"
         android:title="@string/clear_history"
         android:visible="false"
         vlc:showAsAction="ifRoom" />
diff --git a/vlc-android/res/values/attrs.xml b/vlc-android/res/values/attrs.xml
index 12c42bba7..569b1f21d 100644
--- a/vlc-android/res/values/attrs.xml
+++ b/vlc-android/res/values/attrs.xml
@@ -47,7 +47,7 @@
     <attr name="ic_close" format="reference" />
     <attr name="ic_move_media" format="reference" />
     <attr name="ic_save" format="reference" />
-    <attr name="ic_trash_small_normal" format="reference" />
+    <attr name="ic_trash" format="reference" />
     <attr name="gridview_progressbar" format="reference" />
     <attr name="toolbar_popup_style" format="reference" />
     <attr name="progress_mini_player" format="reference" />
diff --git a/vlc-android/res/values/styles.xml b/vlc-android/res/values/styles.xml
index df03960a5..51856f0b8 100644
--- a/vlc-android/res/values/styles.xml
+++ b/vlc-android/res/values/styles.xml
@@ -64,7 +64,7 @@
         <item name="ic_close">@drawable/ic_close</item>
         <item name="ic_save">@drawable/ic_save</item>
         <item name="ic_move_media">@drawable/ic_move_media</item>
-        <item name="ic_trash_small_normal">@drawable/ic_trash_small_normal</item>
+        <item name="ic_trash">@drawable/ic_trash</item>
         <item name="shadow_top_9patch">@drawable/shadow_top</item>
         <item name="shadow_bottom_9patch">@drawable/shadow_bottom</item>
         <item name="gridview_progressbar">@drawable/gridview_progressbar</item>
@@ -159,7 +159,7 @@
         <item name="ic_close">@drawable/ic_close_w</item>
         <item name="ic_save">@drawable/ic_save_w</item>
         <item name="ic_move_media">@drawable/ic_move_media_w</item>
-        <item name="ic_trash_small_normal">@drawable/ic_trash_small_normal_w</item>
+        <item name="ic_trash">@drawable/ic_trash_w</item>
         <item name="shadow_top_9patch">@drawable/shadow_top_dark</item>
         <item name="shadow_bottom_9patch">@drawable/shadow_bottom_dark</item>
         <item name="gridview_progressbar">@drawable/gridview_progressbar_w</item>



More information about the Android mailing list