[Android] Fix search icons

[Nicolas Pomepuy]

vlc-android | branch: 3.2.x | Nicolas Pomepuy <nicolas.pomepuy at gmail.com> | Tue Jul 30 09:07:50 2019 +0200| [7a54d8ecb362c429d29997d4707018494f1c8a8b] | committer: Geoffrey Métais

Fix search icons

(cherry picked from commit e507b4ce6c6623763b1407f31f41f96d829e0058)

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

 .../res/drawable-hdpi/ic_menu_search_normal.png    | Bin 1017 -> 0 bytes
 .../res/drawable-hdpi/ic_menu_search_normal_w.png  | Bin 859 -> 0 bytes
 .../res/drawable-hdpi/ic_menu_search_pressed.png   | Bin 1065 -> 0 bytes
 .../res/drawable-ldpi/ic_menu_search_normal.png    | Bin 563 -> 0 bytes
 .../res/drawable-ldpi/ic_menu_search_normal_w.png  | Bin 582 -> 0 bytes
 .../res/drawable-ldpi/ic_menu_search_pressed.png   | Bin 585 -> 0 bytes
 .../res/drawable-mdpi/ic_menu_search_normal.png    | Bin 697 -> 0 bytes
 .../res/drawable-mdpi/ic_menu_search_normal_w.png  | Bin 613 -> 0 bytes
 .../res/drawable-mdpi/ic_menu_search_pressed.png   | Bin 733 -> 0 bytes
 .../res/drawable-xhdpi/ic_menu_search_normal.png   | Bin 1385 -> 0 bytes
 .../res/drawable-xhdpi/ic_menu_search_normal_w.png | Bin 1182 -> 0 bytes
 .../res/drawable-xhdpi/ic_menu_search_pressed.png  | Bin 1467 -> 0 bytes
 vlc-android/res/drawable/ic_menu_search.xml        |  23 +++++++--------------
 vlc-android/res/drawable/ic_menu_search_normal.xml |  16 ++++++++++++++
 .../res/drawable/ic_menu_search_normal_w.xml       |  16 ++++++++++++++
 .../res/drawable/ic_menu_search_pressed.xml        |  16 ++++++++++++++
 vlc-android/res/menu/activity_option.xml           |   2 +-
 17 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/vlc-android/res/drawable-hdpi/ic_menu_search_normal.png b/vlc-android/res/drawable-hdpi/ic_menu_search_normal.png
deleted file mode 100644
index 01eef9d5f..000000000
Binary files a/vlc-android/res/drawable-hdpi/ic_menu_search_normal.png and /dev/null differ
diff --git a/vlc-android/res/drawable-hdpi/ic_menu_search_normal_w.png b/vlc-android/res/drawable-hdpi/ic_menu_search_normal_w.png
deleted file mode 100644
index 8884e3025..000000000
Binary files a/vlc-android/res/drawable-hdpi/ic_menu_search_normal_w.png and /dev/null differ
diff --git a/vlc-android/res/drawable-hdpi/ic_menu_search_pressed.png b/vlc-android/res/drawable-hdpi/ic_menu_search_pressed.png
deleted file mode 100644
index e805cb32d..000000000
Binary files a/vlc-android/res/drawable-hdpi/ic_menu_search_pressed.png and /dev/null differ
diff --git a/vlc-android/res/drawable-ldpi/ic_menu_search_normal.png b/vlc-android/res/drawable-ldpi/ic_menu_search_normal.png
deleted file mode 100644
index 16cd77878..000000000
Binary files a/vlc-android/res/drawable-ldpi/ic_menu_search_normal.png and /dev/null differ
diff --git a/vlc-android/res/drawable-ldpi/ic_menu_search_normal_w.png b/vlc-android/res/drawable-ldpi/ic_menu_search_normal_w.png
deleted file mode 100644
index 6ecc146a8..000000000
Binary files a/vlc-android/res/drawable-ldpi/ic_menu_search_normal_w.png and /dev/null differ
diff --git a/vlc-android/res/drawable-ldpi/ic_menu_search_pressed.png b/vlc-android/res/drawable-ldpi/ic_menu_search_pressed.png
deleted file mode 100644
index 993074379..000000000
Binary files a/vlc-android/res/drawable-ldpi/ic_menu_search_pressed.png and /dev/null differ
diff --git a/vlc-android/res/drawable-mdpi/ic_menu_search_normal.png b/vlc-android/res/drawable-mdpi/ic_menu_search_normal.png
deleted file mode 100644
index e381a061c..000000000
Binary files a/vlc-android/res/drawable-mdpi/ic_menu_search_normal.png and /dev/null differ
diff --git a/vlc-android/res/drawable-mdpi/ic_menu_search_normal_w.png b/vlc-android/res/drawable-mdpi/ic_menu_search_normal_w.png
deleted file mode 100755
index 7ed3e3080..000000000
Binary files a/vlc-android/res/drawable-mdpi/ic_menu_search_normal_w.png and /dev/null differ
diff --git a/vlc-android/res/drawable-mdpi/ic_menu_search_pressed.png b/vlc-android/res/drawable-mdpi/ic_menu_search_pressed.png
deleted file mode 100644
index 1a7413375..000000000
Binary files a/vlc-android/res/drawable-mdpi/ic_menu_search_pressed.png and /dev/null differ
diff --git a/vlc-android/res/drawable-xhdpi/ic_menu_search_normal.png b/vlc-android/res/drawable-xhdpi/ic_menu_search_normal.png
deleted file mode 100644
index 46ef1787b..000000000
Binary files a/vlc-android/res/drawable-xhdpi/ic_menu_search_normal.png and /dev/null differ
diff --git a/vlc-android/res/drawable-xhdpi/ic_menu_search_normal_w.png b/vlc-android/res/drawable-xhdpi/ic_menu_search_normal_w.png
deleted file mode 100644
index 389c52600..000000000
Binary files a/vlc-android/res/drawable-xhdpi/ic_menu_search_normal_w.png and /dev/null differ
diff --git a/vlc-android/res/drawable-xhdpi/ic_menu_search_pressed.png b/vlc-android/res/drawable-xhdpi/ic_menu_search_pressed.png
deleted file mode 100644
index 2e0246afb..000000000
Binary files a/vlc-android/res/drawable-xhdpi/ic_menu_search_pressed.png and /dev/null differ
diff --git a/vlc-android/res/drawable/ic_menu_search.xml b/vlc-android/res/drawable/ic_menu_search.xml
index 36db361ec..20a8d3e72 100644
--- a/vlc-android/res/drawable/ic_menu_search.xml
+++ b/vlc-android/res/drawable/ic_menu_search.xml
@@ -1,16 +1,7 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <path
-            android:pathData="m9.9999,2.9999c-3.8542,0 -7,3.1459 -7,7 0,3.8542 3.1458,7 7,7 1.748,0 3.345,-0.652 4.5742,-1.7188l0.4258,0.4258v0.7071l4.2832,4.2832a1,1 0,0 0,0.01 0.01,1 1,0 0,0 0.707,0.293 1,1 0,0 0,1 -1,1 1,0 0,0 -0.293,-0.707l-4.2929,-4.293h-0.7071l-0.4258,-0.4258c1.0666,-1.2295 1.7186,-2.8265 1.7186,-4.5745 0,-3.8541 -3.1458,-7 -7,-7zM9.9999,4.9999c2.7735,0 5,2.2265 5,5 0,2.7735 -2.2265,5.002 -5,5.002 -2.7735,0 -5,-2.2285 -5,-5.002 0,-2.7735 2.2265,-5 5,-5z"
-            android:strokeAlpha="1"
-            android:strokeLineJoin="round"
-            android:strokeWidth="1.99960649"
-            android:fillColor="#ffffff"
-            android:strokeColor="#00000000"
-            android:fillType="nonZero"
-            android:fillAlpha="1"
-            android:strokeLineCap="round"/>
-</vector>
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_menu_search_normal" android:state_focused="true" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_menu_search_pressed" android:state_focused="true"/>
+    <item android:drawable="@drawable/ic_menu_search_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_menu_search_normal"/>
+</selector>
\ No newline at end of file
diff --git a/vlc-android/res/drawable/ic_menu_search_normal.xml b/vlc-android/res/drawable/ic_menu_search_normal.xml
new file mode 100644
index 000000000..b3d66f1a6
--- /dev/null
+++ b/vlc-android/res/drawable/ic_menu_search_normal.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+            android:pathData="m9.9999,2.9999c-3.8542,0 -7,3.1459 -7,7 0,3.8542 3.1458,7 7,7 1.748,0 3.345,-0.652 4.5742,-1.7188l0.4258,0.4258v0.7071l4.2832,4.2832a1,1 0,0 0,0.01 0.01,1 1,0 0,0 0.707,0.293 1,1 0,0 0,1 -1,1 1,0 0,0 -0.293,-0.707l-4.2929,-4.293h-0.7071l-0.4258,-0.4258c1.0666,-1.2295 1.7186,-2.8265 1.7186,-4.5745 0,-3.8541 -3.1458,-7 -7,-7zM9.9999,4.9999c2.7735,0 5,2.2265 5,5 0,2.7735 -2.2265,5.002 -5,5.002 -2.7735,0 -5,-2.2285 -5,-5.002 0,-2.7735 2.2265,-5 5,-5z"
+            android:strokeAlpha="1"
+            android:strokeLineJoin="round"
+            android:strokeWidth="1.99960649"
+            android:fillColor="#000000"
+            android:strokeColor="#00000000"
+            android:fillType="nonZero"
+            android:fillAlpha="1"
+            android:strokeLineCap="round"/>
+</vector>
diff --git a/vlc-android/res/drawable/ic_menu_search_normal_w.xml b/vlc-android/res/drawable/ic_menu_search_normal_w.xml
new file mode 100644
index 000000000..36db361ec
--- /dev/null
+++ b/vlc-android/res/drawable/ic_menu_search_normal_w.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+            android:pathData="m9.9999,2.9999c-3.8542,0 -7,3.1459 -7,7 0,3.8542 3.1458,7 7,7 1.748,0 3.345,-0.652 4.5742,-1.7188l0.4258,0.4258v0.7071l4.2832,4.2832a1,1 0,0 0,0.01 0.01,1 1,0 0,0 0.707,0.293 1,1 0,0 0,1 -1,1 1,0 0,0 -0.293,-0.707l-4.2929,-4.293h-0.7071l-0.4258,-0.4258c1.0666,-1.2295 1.7186,-2.8265 1.7186,-4.5745 0,-3.8541 -3.1458,-7 -7,-7zM9.9999,4.9999c2.7735,0 5,2.2265 5,5 0,2.7735 -2.2265,5.002 -5,5.002 -2.7735,0 -5,-2.2285 -5,-5.002 0,-2.7735 2.2265,-5 5,-5z"
+            android:strokeAlpha="1"
+            android:strokeLineJoin="round"
+            android:strokeWidth="1.99960649"
+            android:fillColor="#ffffff"
+            android:strokeColor="#00000000"
+            android:fillType="nonZero"
+            android:fillAlpha="1"
+            android:strokeLineCap="round"/>
+</vector>
diff --git a/vlc-android/res/drawable/ic_menu_search_pressed.xml b/vlc-android/res/drawable/ic_menu_search_pressed.xml
new file mode 100644
index 000000000..d283f62fc
--- /dev/null
+++ b/vlc-android/res/drawable/ic_menu_search_pressed.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+            android:pathData="m9.9999,2.9999c-3.8542,0 -7,3.1459 -7,7 0,3.8542 3.1458,7 7,7 1.748,0 3.345,-0.652 4.5742,-1.7188l0.4258,0.4258v0.7071l4.2832,4.2832a1,1 0,0 0,0.01 0.01,1 1,0 0,0 0.707,0.293 1,1 0,0 0,1 -1,1 1,0 0,0 -0.293,-0.707l-4.2929,-4.293h-0.7071l-0.4258,-0.4258c1.0666,-1.2295 1.7186,-2.8265 1.7186,-4.5745 0,-3.8541 -3.1458,-7 -7,-7zM9.9999,4.9999c2.7735,0 5,2.2265 5,5 0,2.7735 -2.2265,5.002 -5,5.002 -2.7735,0 -5,-2.2285 -5,-5.002 0,-2.7735 2.2265,-5 5,-5z"
+            android:strokeAlpha="1"
+            android:strokeLineJoin="round"
+            android:strokeWidth="1.99960649"
+            android:fillColor="@color/orange300"
+            android:strokeColor="#00000000"
+            android:fillType="nonZero"
+            android:fillAlpha="1"
+            android:strokeLineCap="round"/>
+</vector>
diff --git a/vlc-android/res/menu/activity_option.xml b/vlc-android/res/menu/activity_option.xml
index 493207b91..289851c1d 100644
--- a/vlc-android/res/menu/activity_option.xml
+++ b/vlc-android/res/menu/activity_option.xml
@@ -13,7 +13,7 @@
     <item
             android:orderInCategory="1"
             android:id="@+id/ml_menu_filter"
-            android:icon="@drawable/ic_menu_search"
+            android:icon="@drawable/ic_menu_search_w"
             vlc:actionViewClass="androidx.appcompat.widget.SearchView"
             android:title="@string/searchable_hint"
             vlc:showAsAction="always|collapseActionView"/>