Snap: api2: update promode icons

 * Added icons are from https://materialdesignicons.com/.

Change-Id: Ibea13476f4bb98089ff1a86540dd3c4913b84edf

25 files changed, 53 insertions, 81 deletions

diff --git a/res/drawable/promode_iso.xml b/res/color/promode_selection_tint.xml
index 26b31a5b8..4ba269ec2 100644
--- a/res/drawable/promode_iso.xml
+++ b/res/color/promode_selection_tint.xml
@@ -28,6 +28,6 @@
     -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true" android:state_pressed="false"
-          android:drawable="@drawable/icon_iso_blue" />
-    <item android:drawable="@drawable/icon_iso" />
+          android:color="@color/blue" />
+    <item android:color="@color/white" />
 </selector>
diff --git a/res/drawable/auto_blue.png b/res/drawable/auto_blue.png
deleted file mode 100644
index acf632e16..000000000
--- a/res/drawable/auto_blue.png
+++ /dev/null
diff --git a/res/drawable/cloudy.png b/res/drawable/cloudy.png
deleted file mode 100644
index b29ab9e5d..000000000
--- a/res/drawable/cloudy.png
+++ /dev/null
diff --git a/res/drawable/cloudy_blue.png b/res/drawable/cloudy_blue.png
deleted file mode 100644
index 303a2703e..000000000
--- a/res/drawable/cloudy_blue.png
+++ /dev/null
diff --git a/res/drawable/fluorescent.png b/res/drawable/fluorescent.png
deleted file mode 100644
index d25f7473e..000000000
--- a/res/drawable/fluorescent.png
+++ /dev/null
diff --git a/res/drawable/fluorescent_blue.png b/res/drawable/fluorescent_blue.png
deleted file mode 100644
index 7fb7836dd..000000000
--- a/res/drawable/fluorescent_blue.png
+++ /dev/null
diff --git a/res/drawable/ic_scene_mode_auto_wb.xml b/res/drawable/ic_scene_mode_auto_wb.xml
new file mode 100644
index 000000000..f8e95803c
--- /dev/null
+++ b/res/drawable/ic_scene_mode_auto_wb.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M10.3,16L9.6,14H6.4L5.7,16H3.8L7,7H9L12.2,16M22,7L20.8,13.29L19.3,7H17.7L16.21,13.29L15,7H14.24C12.77,5.17 10.5,4 8,4A8,8 0 0,0 0,12A8,8 0 0,0 8,20C11.13,20 13.84,18.19 15.15,15.57L15.25,16H17L18.5,9.9L20,16H21.75L23.8,7M6.85,12.65H9.15L8,9L6.85,12.65Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_cloudy.xml b/res/drawable/ic_scene_mode_cloudy.xml
new file mode 100644
index 000000000..70d11d165
--- /dev/null
+++ b/res/drawable/ic_scene_mode_cloudy.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M19.35,10.03C18.67,6.59 15.64,4 12,4C9.11,4 6.6,5.64 5.35,8.03C2.34,8.36 0,10.9 0,14A6,6 0 0,0 6,20H19A5,5 0 0,0 24,15C24,12.36 21.95,10.22 19.35,10.03Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_fluorescent.xml b/res/drawable/ic_scene_mode_fluorescent.xml
new file mode 100644
index 000000000..db9347c2c
--- /dev/null
+++ b/res/drawable/ic_scene_mode_fluorescent.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M4.96,19.95L6.76,18.15L5.34,16.74L3.55,18.53M3.55,4.46L5.34,6.26L6.76,4.84L4.96,3.05M20.45,18.53L18.66,16.74L17.24,18.15L19.04,19.95M13,22.45V19.5H11V22.45C11.32,22.45 13,22.45 13,22.45M19.04,3.05L17.24,4.84L18.66,6.26L20.45,4.46M11,3.5H13V0.55H11M5,14.5H19V8.5H5V14.5Z" />
+</vector>
diff --git a/res/drawable/icon_exposure.png b/res/drawable/icon_exposure.png
deleted file mode 100644
index ff5397251..000000000
--- a/res/drawable/icon_exposure.png
+++ /dev/null
diff --git a/res/drawable/icon_exposure_blue.png b/res/drawable/icon_exposure_blue.png
deleted file mode 100644
index 544b98ab4..000000000
--- a/res/drawable/icon_exposure_blue.png
+++ /dev/null
diff --git a/res/drawable/icon_iso.png b/res/drawable/icon_iso.png
deleted file mode 100644
index 85662af5e..000000000
--- a/res/drawable/icon_iso.png
+++ /dev/null
diff --git a/res/drawable/icon_iso_blue.png b/res/drawable/icon_iso_blue.png
deleted file mode 100644
index 001d8c9f5..000000000
--- a/res/drawable/icon_iso_blue.png
+++ /dev/null
diff --git a/res/drawable/icon_manual.png b/res/drawable/icon_manual.png
deleted file mode 100644
index 53e2ff5ec..000000000
--- a/res/drawable/icon_manual.png
+++ /dev/null
diff --git a/res/drawable/icon_manual_blue.png b/res/drawable/icon_manual_blue.png
deleted file mode 100644
index 52b2daa19..000000000
--- a/res/drawable/icon_manual_blue.png
+++ /dev/null
diff --git a/res/drawable/icon_white_balance_blue.png b/res/drawable/icon_white_balance_blue.png
deleted file mode 100644
index ca84b89d8..000000000
--- a/res/drawable/icon_white_balance_blue.png
+++ /dev/null
diff --git a/res/drawable/incandecent.png b/res/drawable/incandecent.png
deleted file mode 100644
index d601e4b5c..000000000
--- a/res/drawable/incandecent.png
+++ /dev/null
diff --git a/res/drawable/incandecent_blue.png b/res/drawable/incandecent_blue.png
deleted file mode 100644
index 0c3eabf13..000000000
--- a/res/drawable/incandecent_blue.png
+++ /dev/null
diff --git a/res/drawable/promode_manual.xml b/res/drawable/promode_manual.xml
deleted file mode 100644
index 133b43180..000000000
--- a/res/drawable/promode_manual.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2017, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-    * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-    -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:state_pressed="false"
-          android:drawable="@drawable/icon_manual_blue" />
-    <item android:drawable="@drawable/icon_manual" />
-</selector>
diff --git a/res/drawable/promode_white_balance.xml b/res/drawable/promode_white_balance.xml
deleted file mode 100644
index 91b98ac8c..000000000
--- a/res/drawable/promode_white_balance.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2017, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-    * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-    -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:state_pressed="false"
-          android:drawable="@drawable/icon_white_balance_blue" />
-    <item android:drawable="@drawable/icon_white_balance" />
-</selector>
diff --git a/res/drawable/promode_exposure.xml b/res/drawable/promode_zoom.xml
index ff2afa49a..5c56d72f2 100644
--- a/res/drawable/promode_exposure.xml
+++ b/res/drawable/promode_zoom.xml
@@ -28,6 +28,7 @@
     -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true" android:state_pressed="false"
-          android:drawable="@drawable/icon_exposure_blue" />
-    <item android:drawable="@drawable/icon_exposure" />
+          android:drawable="@drawable/ic_settings_zoom"
+          android:tint="@color/blue" />
+    <item android:drawable="@drawable/ic_settings_zoom" />
 </selector>
diff --git a/res/drawable/sunlight.png b/res/drawable/sunlight.png
deleted file mode 100644
index cc33dcc3d..000000000
--- a/res/drawable/sunlight.png
+++ /dev/null
diff --git a/res/drawable/sunlight_blue.png b/res/drawable/sunlight_blue.png
deleted file mode 100644
index c390ec653..000000000
--- a/res/drawable/sunlight_blue.png
+++ /dev/null
diff --git a/res/layout/pro_mode_layout.xml b/res/layout/pro_mode_layout.xml
index 7dd12aa01..5f123eaa4 100644
--- a/res/layout/pro_mode_layout.xml
+++ b/res/layout/pro_mode_layout.xml
@@ -44,7 +44,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:focusable="true"
-            android:drawableTop="@drawable/promode_exposure"
+            android:drawableTop="@drawable/ic_settings_exposure"
+            android:drawableTint="@color/promode_selection_tint"
             android:gravity="center"
             android:layout_gravity="center"
             android:layout_weight="1"/>
@@ -62,7 +63,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:focusable="true"
-            android:drawableTop="@drawable/promode_manual"
+            android:drawableTop="@drawable/ic_settings_focus"
+            android:drawableTint="@color/promode_selection_tint"
             android:gravity="center"
             android:layout_gravity="center"
             android:layout_weight="1" />
@@ -80,7 +82,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:focusable="true"
-            android:drawableTop="@drawable/promode_white_balance"
+            android:drawableTop="@drawable/ic_settings_wb_api2"
+            android:drawableTint="@color/promode_selection_tint"
             android:gravity="center"
             android:layout_gravity="center"
             android:layout_weight="1"/>
@@ -97,7 +100,8 @@
             android:id="@+id/iso_value"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:drawableTop="@drawable/promode_iso"
+            android:drawableTop="@drawable/ic_settings_iso"
+            android:drawableTint="@color/promode_selection_tint"
             android:focusable="true"
             android:gravity="center"
             android:layout_gravity="center"
@@ -115,7 +119,8 @@
             android:id="@+id/zoom_seekbar_value"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:drawableTop="@drawable/promode_manual"
+            android:drawableTop="@drawable/ic_settings_zoom"
+            android:drawableTint="@color/promode_selection_tint"
             android:focusable="true"
             android:gravity="center"
             android:layout_gravity="center"
diff --git a/src/com/android/camera/ui/ProMode.java b/src/com/android/camera/ui/ProMode.java
index d1d22a43a..3ff9ae2be 100644
--- a/src/com/android/camera/ui/ProMode.java
+++ b/src/com/android/camera/ui/ProMode.java
@@ -62,10 +62,9 @@ public class ProMode extends View {
     private static final int BLUE = 0xff4693fb;
     private static final int SELECTED_DOT_SIZE = 20;
     private static final int DOT_SIZE = 10;
-    private static final int[] wbIcons = {R.drawable.auto, R.drawable.incandecent,
-            R.drawable.fluorescent, R.drawable.sunlight, R.drawable.cloudy};
-    private static final int[] wbIconsBlue = {R.drawable.auto_blue, R.drawable.incandecent_blue,
-            R.drawable.fluorescent_blue, R.drawable.sunlight_blue, R.drawable.cloudy_blue};
+    private static final int[] wbIcons = {R.drawable.ic_scene_mode_auto_wb,
+            R.drawable.ic_scene_mode_backlight, R.drawable.ic_scene_mode_fluorescent,
+            R.drawable.ic_scene_mode_sunset, R.drawable.ic_scene_mode_cloudy};
     private static final int WB_ICON_SIZE = 80;
     private PathMeasure mCurveMeasure;
     private int mCurveLeft;
@@ -350,7 +349,7 @@ public class ProMode extends View {
                 ((TextView) v).setTextColor(Color.WHITE);
             } else if (v instanceof ImageView) {
                 if (mMode == WHITE_BALANCE_MODE) {
-                    ((ImageView) v).setImageResource(wbIcons[mIndex]);
+                    ((ImageView) v).setColorFilter(null);
                 }
             }
         }
@@ -362,7 +361,7 @@ public class ProMode extends View {
             ((TextView) v).setTextColor(BLUE);
         } else if (v instanceof ImageView) {
             if (mMode == WHITE_BALANCE_MODE) {
-                ((ImageView) v).setImageResource(wbIconsBlue[mIndex]);
+                ((ImageView) v).setColorFilter(BLUE);
             }
         }
         if (key != null) mSettingsManager.setValueIndex(key, mIndex);