From 549f9b02a86c589f1acf0220006aaf7a8fe1d146 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 6 Oct 2014 21:37:30 -0700
Subject: Updating the wallpaperpicker thumb selection feedback

> Using shape drawable instead of 9-patch image
> For L and above, using ripple click feedback with a tick
when selected. The vector path for tick is from go/icons ('Done')

Bug: 17897837

Change-Id: Ic9c9e455eb8bc39322b1474dd55432961b9a6498
---
 .../res/drawable-hdpi/tile_picker_focused.9.png    | Bin 168 -> 0 bytes
 .../res/drawable-hdpi/tile_picker_pressed.9.png    | Bin 144 -> 0 bytes
 .../res/drawable-hdpi/tile_picker_selected.9.png   | Bin 165 -> 0 bytes
 .../res/drawable-mdpi/tile_picker_focused.9.png    | Bin 165 -> 0 bytes
 .../res/drawable-mdpi/tile_picker_pressed.9.png    | Bin 142 -> 0 bytes
 .../res/drawable-mdpi/tile_picker_selected.9.png   | Bin 159 -> 0 bytes
 WallpaperPicker/res/drawable-v21/ic_tick.xml       |  31 ++++++++++++++++
 .../res/drawable-v21/wallpaper_tile_fg.xml         |  39 +++++++++++++++++++++
 .../res/drawable-xhdpi/tile_picker_focused.9.png   | Bin 174 -> 0 bytes
 .../res/drawable-xhdpi/tile_picker_pressed.9.png   | Bin 147 -> 0 bytes
 .../res/drawable-xhdpi/tile_picker_selected.9.png  | Bin 167 -> 0 bytes
 .../res/drawable-xxhdpi/tile_picker_focused.9.png  | Bin 189 -> 0 bytes
 .../res/drawable-xxhdpi/tile_picker_pressed.9.png  | Bin 154 -> 0 bytes
 .../res/drawable-xxhdpi/tile_picker_selected.9.png | Bin 175 -> 0 bytes
 WallpaperPicker/res/drawable/wallpaper_tile_fg.xml |  32 ++++++++++++++---
 15 files changed, 98 insertions(+), 4 deletions(-)
 delete mode 100644 WallpaperPicker/res/drawable-hdpi/tile_picker_focused.9.png
 delete mode 100644 WallpaperPicker/res/drawable-hdpi/tile_picker_pressed.9.png
 delete mode 100644 WallpaperPicker/res/drawable-hdpi/tile_picker_selected.9.png
 delete mode 100644 WallpaperPicker/res/drawable-mdpi/tile_picker_focused.9.png
 delete mode 100644 WallpaperPicker/res/drawable-mdpi/tile_picker_pressed.9.png
 delete mode 100644 WallpaperPicker/res/drawable-mdpi/tile_picker_selected.9.png
 create mode 100644 WallpaperPicker/res/drawable-v21/ic_tick.xml
 create mode 100644 WallpaperPicker/res/drawable-v21/wallpaper_tile_fg.xml
 delete mode 100644 WallpaperPicker/res/drawable-xhdpi/tile_picker_focused.9.png
 delete mode 100644 WallpaperPicker/res/drawable-xhdpi/tile_picker_pressed.9.png
 delete mode 100644 WallpaperPicker/res/drawable-xhdpi/tile_picker_selected.9.png
 delete mode 100644 WallpaperPicker/res/drawable-xxhdpi/tile_picker_focused.9.png
 delete mode 100644 WallpaperPicker/res/drawable-xxhdpi/tile_picker_pressed.9.png
 delete mode 100644 WallpaperPicker/res/drawable-xxhdpi/tile_picker_selected.9.png

(limited to 'WallpaperPicker')

diff --git a/WallpaperPicker/res/drawable-hdpi/tile_picker_focused.9.png b/WallpaperPicker/res/drawable-hdpi/tile_picker_focused.9.png
deleted file mode 100644
index c72d6a2c6..000000000
Binary files a/WallpaperPicker/res/drawable-hdpi/tile_picker_focused.9.png and /dev/null differ
diff --git a/WallpaperPicker/res/drawable-hdpi/tile_picker_pressed.9.png b/WallpaperPicker/res/drawable-hdpi/tile_picker_pressed.9.png
deleted file mode 100644
index 44c65ac3c..000000000
Binary files a/WallpaperPicker/res/drawable-hdpi/tile_picker_pressed.9.png and /dev/null differ
diff --git a/WallpaperPicker/res/drawable-hdpi/tile_picker_selected.9.png b/WallpaperPicker/res/drawable-hdpi/tile_picker_selected.9.png
deleted file mode 100644
index 461bacbcb..000000000
Binary files a/WallpaperPicker/res/drawable-hdpi/tile_picker_selected.9.png and /dev/null differ
diff --git a/WallpaperPicker/res/drawable-mdpi/tile_picker_focused.9.png b/WallpaperPicker/res/drawable-mdpi/tile_picker_focused.9.png
deleted file mode 100644
index 13b325b87..000000000
Binary files a/WallpaperPicker/res/drawable-mdpi/tile_picker_focused.9.png and /dev/null differ
diff --git a/WallpaperPicker/res/drawable-mdpi/tile_picker_pressed.9.png b/WallpaperPicker/res/drawable-mdpi/tile_picker_pressed.9.png
deleted file mode 100644
index 4e8196d36..000000000
Binary files a/WallpaperPicker/res/drawable-mdpi/tile_picker_pressed.9.png and /dev/null differ
diff --git a/WallpaperPicker/res/drawable-mdpi/tile_picker_selected.9.png b/WallpaperPicker/res/drawable-mdpi/tile_picker_selected.9.png
deleted file mode 100644
index eee69ec6d..000000000
Binary files a/WallpaperPicker/res/drawable-mdpi/tile_picker_selected.9.png and /dev/null differ
diff --git a/WallpaperPicker/res/drawable-v21/ic_tick.xml b/WallpaperPicker/res/drawable-v21/ic_tick.xml
new file mode 100644
index 000000000..5b270279d
--- /dev/null
+++ b/WallpaperPicker/res/drawable-v21/ic_tick.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="48dp"
+    android:viewportHeight="48"
+    android:viewportWidth="48"
+    android:width="48dp" >
+
+    <group>
+        <path
+            android:name="tick"
+            android:fillColor="#FFFFFFFF"
+            android:pathData="M18 32.34l-8.34-8.34-2.83 2.83 11.17 11.17 24-24-2.83-2.83z" />
+    </group>
+
+</vector>
\ No newline at end of file
diff --git a/WallpaperPicker/res/drawable-v21/wallpaper_tile_fg.xml b/WallpaperPicker/res/drawable-v21/wallpaper_tile_fg.xml
new file mode 100644
index 000000000..97cdcd637
--- /dev/null
+++ b/WallpaperPicker/res/drawable-v21/wallpaper_tile_fg.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#66FFFFFF" >
+
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@android:color/white"/>
+    <item
+        android:bottom="23.25dp"
+        android:left="29.25dp"
+        android:right="29.25dp"
+        android:top="23.25dp">
+        <selector>
+            <item
+                android:drawable="@drawable/ic_tick"
+                android:state_selected="true"/>
+            <item
+                android:drawable="@drawable/ic_tick"
+                android:state_checked="true"/>
+        </selector>
+    </item>
+
+</ripple>
\ No newline at end of file
diff --git a/WallpaperPicker/res/drawable-xhdpi/tile_picker_focused.9.png b/WallpaperPicker/res/drawable-xhdpi/tile_picker_focused.9.png
deleted file mode 100644
index 279e85963..000000000
Binary files a/WallpaperPicker/res/drawable-xhdpi/tile_picker_focused.9.png and /dev/null differ
diff --git a/WallpaperPicker/res/drawable-xhdpi/tile_picker_pressed.9.png b/WallpaperPicker/res/drawable-xhdpi/tile_picker_pressed.9.png
deleted file mode 100644
index abe0e0080..000000000
Binary files a/WallpaperPicker/res/drawable-xhdpi/tile_picker_pressed.9.png and /dev/null differ
diff --git a/WallpaperPicker/res/drawable-xhdpi/tile_picker_selected.9.png b/WallpaperPicker/res/drawable-xhdpi/tile_picker_selected.9.png
deleted file mode 100644
index b047591ac..000000000
Binary files a/WallpaperPicker/res/drawable-xhdpi/tile_picker_selected.9.png and /dev/null differ
diff --git a/WallpaperPicker/res/drawable-xxhdpi/tile_picker_focused.9.png b/WallpaperPicker/res/drawable-xxhdpi/tile_picker_focused.9.png
deleted file mode 100644
index 1004c14b8..000000000
Binary files a/WallpaperPicker/res/drawable-xxhdpi/tile_picker_focused.9.png and /dev/null differ
diff --git a/WallpaperPicker/res/drawable-xxhdpi/tile_picker_pressed.9.png b/WallpaperPicker/res/drawable-xxhdpi/tile_picker_pressed.9.png
deleted file mode 100644
index 9658444a1..000000000
Binary files a/WallpaperPicker/res/drawable-xxhdpi/tile_picker_pressed.9.png and /dev/null differ
diff --git a/WallpaperPicker/res/drawable-xxhdpi/tile_picker_selected.9.png b/WallpaperPicker/res/drawable-xxhdpi/tile_picker_selected.9.png
deleted file mode 100644
index a3cd30369..000000000
Binary files a/WallpaperPicker/res/drawable-xxhdpi/tile_picker_selected.9.png and /dev/null differ
diff --git a/WallpaperPicker/res/drawable/wallpaper_tile_fg.xml b/WallpaperPicker/res/drawable/wallpaper_tile_fg.xml
index c299f32c6..c66fa50ad 100644
--- a/WallpaperPicker/res/drawable/wallpaper_tile_fg.xml
+++ b/WallpaperPicker/res/drawable/wallpaper_tile_fg.xml
@@ -15,9 +15,33 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:drawable="@drawable/tile_picker_selected" />
-    <item android:state_focused="true" android:drawable="@drawable/tile_picker_focused" />
-    <item android:state_pressed="true" android:drawable="@drawable/tile_picker_pressed" />
-    <item android:state_selected="true" android:drawable="@drawable/tile_picker_selected" />
+    <item android:state_checked="true" >
+        <shape>
+            <stroke
+                android:width="2dp"
+                android:color="#FFFFFFFF" />
+            <solid android:color="#33FFFFFF"/>
+        </shape>
+    </item>
+    <item android:state_focused="true" >
+        <shape>
+            <stroke
+                android:width="2dp"
+                android:color="#FFFFFFFF" />
+        </shape>
+    </item>
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#33FFFFFF"/>
+        </shape>
+    </item>
+    <item android:state_selected="true" >
+        <shape>
+            <stroke
+                android:width="2dp"
+                android:color="#FFFFFFFF" />
+            <solid android:color="#33FFFFFF"/>
+        </shape>
+    </item>
     <item android:drawable="@android:color/transparent" />
 </selector>
-- 
cgit v1.2.3