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: [PATCH] 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
---
 .../drawable-hdpi/tile_picker_focused.9.png   | Bin 168 -> 0 bytes
 .../drawable-hdpi/tile_picker_pressed.9.png   | Bin 144 -> 0 bytes
 .../drawable-hdpi/tile_picker_selected.9.png  | Bin 165 -> 0 bytes
 .../drawable-mdpi/tile_picker_focused.9.png   | Bin 165 -> 0 bytes
 .../drawable-mdpi/tile_picker_pressed.9.png   | Bin 142 -> 0 bytes
 .../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 ++++++++++++++++++
 .../drawable-xhdpi/tile_picker_focused.9.png  | Bin 174 -> 0 bytes
 .../drawable-xhdpi/tile_picker_pressed.9.png  | Bin 147 -> 0 bytes
 .../drawable-xhdpi/tile_picker_selected.9.png | Bin 167 -> 0 bytes
 .../drawable-xxhdpi/tile_picker_focused.9.png | Bin 189 -> 0 bytes
 .../drawable-xxhdpi/tile_picker_pressed.9.png | Bin 154 -> 0 bytes
 .../tile_picker_selected.9.png                | Bin 175 -> 0 bytes
 .../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

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 c72d6a2c62b343484f5bfc0c9d7de596f675a0b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmSQK*5Dp-y;YjHK@;M7UB8wRq
zxI00Z(fs7;wLn2HPZ!4!jfs0FIC3=@2r#QZI{f!%#ftWAVxmX+baYY<w=KBzFrjO~
zlL)_cf}RocWUlQoGAX>om^0u0Pj*D(g|gbnk1ZZrOZQe^d2_c#db-$)bzMMH89ZJ6
KT-G@yGywpL?>FiI

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 44c65ac3ca4991f0248d6b55d9667eda0f73c38b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmSQK*5Dp-y;YjHK@;M7UB8wRq
zxI00Z(fs7;wLn25PZ!4!jfrn3DGD(t@EjJ)d;j?Ve$F=Ma6f_I%ORp$8MK?(LdvhO
kh41+D;}B2d?2o2=K|Wj=6Aw+41nOq+boFyt=akR{04|UyEC2ui

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 461bacbcb1b60d0c8aa131c3f2ee2643c7228aec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 165
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmSQK*5Dp-y;YjHK@;M7UB8wRq
zxI00Z(fs7;wLn34PZ!4!jfrO`IC3=@@UWzJzyG|ku3!&`*Q<rDEqp9On@+ba2-<LE
zZ$Odh+}FJ-TLd3Y&OGe4Q~1W|ni{Vk_cuI>4xPl)d3Da&6H;8C@4mMI8p+`4>gTe~
HDWM4f2)Z}I

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 13b325b87c1ed8668881cbfa991df9e851abc0df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 165
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VEX7WqAsj$Z!;#Vfk}U9uEM{Qf
z?gU{*^OL970tMYYT^vIsruOz9<UC-&!|cD%IPJghx_*@h)7qXLNXSvVxk5z8l+7#c
zb3oXn3uULhR$rUR@K@KW=+{%GO-kkbb1YZ(MDGtQX6CypnfPL^aW&9L22WQ%mvv4F
FO#o6JGa~>1

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 4e8196d3692e142d7be6af68e7a36422851f44f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VEX7WqAsj$Z!;#Vfk}U9uEM{Qf
z?gU{*^OL970tF2`T^vIsre2+($j4y7apc9O?;ro)FKIi|xcr$<aN!C@3ELP4(`aTJ
h=ZBla7M1;Z$!O`qm1OaO!5gTT!PC{xWt~$(695W5C{6$X

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 eee69ec6daf5b6a02ee6931e3a0c13a7a0cee341..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VEX7WqAsj$Z!;#Vfk}U9uEM{Qf
z?gU{*^OL970tFpCT^vIsrmpRC<YG|ZIUMz|*6terv1YEX3Ka$h9MPJ>3mRtZWT-qj
y(I;p1oj%XAS)RIk@+-5dxN2);CcMpN_`u-0Uy?P7*MbFT7=x#)pUXO@geCxH1uP{1

diff --git a/WallpaperPicker/res/drawable-v21/ic_tick.xml b/WallpaperPicker/res/drawable-v21/ic_tick.xml
new file mode 100644
index 0000000000..5b270279d9
--- /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 0000000000..97cdcd6370
--- /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 279e859630189a0bfb07e9a9e66a6c33225aea1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 174
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11|+SoP4xm&EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zaCd?*qxs3xYk`6Ro-U3d8WXQh4&*wZz~el5V{`TA?fmU4q5~5RYU*`4m#Ug7+<vtn
z|Bi^_1a1YP_8ZqWX07^p{m+f-`W{~M{qJ3<(OSOD@>Whp*<H&Ys}vjbC!7&qb>;xG
QG0<!VPgg&ebxsLQ0LlS64*&oF

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 abe0e00801a132bd719603cd8283ff58d0d71610..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11|+SoP4xm&EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zaCd?*qxs3xYk`8Mo-U3d8WZ1MUdYQ}z{7m7=IYN~|IOlsrmC+{P;*mPUd)zo<uF@_
oe`M3@jX#VkJ{+I%=GtmKk;7bhFK^cT0UE&I>FVdQ&MBb@00~tr_W%F@

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 b047591ac882c6b62647a128cbde23f63468a57a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11|+SoP4xm&EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zaCd?*qxs3xYk`8Eo-U3d8WW#R3S>Lrz{C1H^!)Y1-<met|IMg86|~B#rNhUGWonb^
zI$p27C4M`UIZv-Cd1hO=REGJ6S8jdDXZNS^cAZ|6G6T;txIC2RpW_e$vWdad)z4*}
HQ$iB}J1R7<

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 1004c14b84c18a5c08925383a019be6697066b0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5X;yqm)Ln>~)nR<|mL6O5{?v4NdpK3;a4{MvUf&ICbol6|s
zq)l86r5BBU8NN0BASQ59!ef@o(gQye_8hygdiS=eqOAWIe{9@*ykq&+#}X0uOSx|R
m{@l0b$GVGWS7gREFfvHZlU7Tqmb3y|#o+1c=d#Wzp$PytI7qty

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 9658444a10d5c03f82634250b4ea6b4c5cf76684..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XY&=~YLn>~)xw=u5L4n8VU=4dog!mDWnFrcsMJ~j0PvQ!w
zWRA_vt`0r7%AZrlqTs=SM)~)d*XovqH!w1+T*IXq^hObA3<HCwtDnm{r-UW|$d51o

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 a3cd303695218a8cb57e3362c9dd184f7ffa098e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5X0zF+ELn>}1{rUgjo>}j}i4z^sLL3cMl7+8YrFyP21TkK4
z<niG#VOq>~`CfvX$Et%fHU4nCxNkB`%Z*o#=Vir~5@}Nj<_!muCeC6AImyH#!Eo-7
WxZ0s(%cX#ZGkCiCxvX<aXaWG;H#!0U

diff --git a/WallpaperPicker/res/drawable/wallpaper_tile_fg.xml b/WallpaperPicker/res/drawable/wallpaper_tile_fg.xml
index c299f32c6d..c66fa50ad6 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>