From 7573f496a11a8c283fdd1559d159d3bdb3b3117a Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 19 Nov 2014 11:59:24 -0800
Subject: [PATCH] Fix several small layout and color issues

Adjusts switch track asset for consistent alignment across DPI buckets,
adjusts edit text background. Lightens the "Light" theme action bar
color so that it doesn't blend in with the action bar shadow.

BUG: 18430444
BUG: 18356558
BUG: 18390994
Change-Id: I1d1e26239fa0c921a65e4ec8b5df0b0093b3989c
---
 .../switch_track_mtrl_alpha.9.png             | Bin 468 -> 475 bytes
 .../switch_track_mtrl_alpha.9.png             | Bin 102 -> 0 bytes
 core/res/res/drawable/edit_text_material.xml  |  34 +++++++++---------
 core/res/res/values/colors_material.xml       |   2 +-
 core/res/res/values/dimens_material.xml       |   4 +++
 5 files changed, 23 insertions(+), 17 deletions(-)
 delete mode 100644 core/res/res/drawable-ldpi/switch_track_mtrl_alpha.9.png

diff --git a/core/res/res/drawable-hdpi/switch_track_mtrl_alpha.9.png b/core/res/res/drawable-hdpi/switch_track_mtrl_alpha.9.png
index 0ebe65e79684fbeb0549f2745d61e7cc0e811b15..9415bc045b5e488149bdba6aced5c79464b4b686 100644
GIT binary patch
delta 443
zcmV;s0Yv`P1KR_T7aSW11^@s6gg;a-00006VoOIv0RI600RN!9r<0K}7k>Z;bV*G`
z2i^-40x%zdR`K@$00C%8L_t(Y$K_W`PQyS9eNH4ISh9sfw1=ovRe~L#vozeOn{tw<
zM?iutOCZqXvGG(UWTs7%X_4?|B9G@ij}w0)*iYD^lc9hPAx!XBg=DI0M)IEIlH?P~
zl0T(X{Zj2Rd%knT4e^BJN`FaehQ;l#NKUpmKp%0UYi@umlIws2weD9&ms`B8<mSe6
z1^80XF0$5hBsup)fIi}>0jas4)W+#)ivzU8;tWU@hP;os^M$#Xw56JRz6LM?PytAL
zCQPb0BLG(o9<+T3H<2>;wyAJmwTMWi`8n=WE(2wEOfpj*u{U=H=YIe$B9UJz{zlgf
z`w4)vNMS!!eE8n^CxG`z<Zp`qi`?bhD}d*LyPd;%QT&ZA0RRyp$y7v207WG7LPSdC
zp)b`Ik;1+Rb+Ln2IA3j_4P4u2!P?&9Kt51c%XjK(5&HQ<r+$9)Nyan7-34a257j@a
l-Oe-I{~Vp=h(8YU4HR~Q%j3KkhfDwf002ovPDHLkV1mJF$>;z8

delta 455
zcmV;&0XY8K1JnbM7k?TE1^@s6Ph*FQ00004b3#c}2nYxWd<bNS00009a7bBm000Y#
z000Y#0XNCZtpET4c1c7*R7i=%mQ7B>Kn#W7G!hXk*}@^(Lm;6_u;b?}lpC=rCy9Cl
zq_SlR1e!h;*uil#A&{hbQk2N!d7m@Vj3?lKVofacWwZ}*GJg`dUL@_4$U7x@OL9r_
ziDb^Ia)~b`FLm=l?kq6dfX_&-1hQqbbbKZAnhJ=*C-Pnx<AUU-p@6N77bdoFe)aI0
zKfV)#Pci+AHZqUmQ(1u+TocZX$!|*?ldc5Cuk^3LWgwV@%)q-y=V$!+u^<Ihwwiul
z0+<3Q03`8!(SJ&b_)Gy@I1cLe`Bg_?OxHf3@PO|MQvfp)>qF`@6aPYE6PIud;A9~9
zsrZ*Mzw8G9j(UQ69g2S`5B~u0HW2(({CD8G`Cb65U979r=UM#An1v?*asb&t@J##@
z54U>g3EIwgtP{=`pb2v`xsS7b&e+**;I;s5r(L_6wm{W*S91mQ)z9ypUj-L~@Bb##
xP(VuZhVeVxyTl(Quk{^nw5zio`ePIjz5s!qkr@4IZx;Xn002ovPDHLkV1gpZ%Vhun

diff --git a/core/res/res/drawable-ldpi/switch_track_mtrl_alpha.9.png b/core/res/res/drawable-ldpi/switch_track_mtrl_alpha.9.png
deleted file mode 100644
index a58128f44b0af84d46fe74b46e0182f564c10102..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 102
zcmeAS@N?(olHy`uVBq!ia0vp^tU%1i!3HFsuehcLq;x%9978H@B_}jA{P&R1YvB3!
zSR_Ru?!*88|M?7hbU4^qSPi!d=UQjlIdKXwC~7)7>hhea0%~ONboFyt=akR{024PG
Axc~qF

diff --git a/core/res/res/drawable/edit_text_material.xml b/core/res/res/drawable/edit_text_material.xml
index bbc7301d938fd..38ac5676a13a1 100644
--- a/core/res/res/drawable/edit_text_material.xml
+++ b/core/res/res/drawable/edit_text_material.xml
@@ -15,21 +15,23 @@
 -->
 
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
-        android:inset="@dimen/control_inset_material">
-    <ripple android:color="?attr/colorControlActivated">
-        <item>
-            <selector>
-                <item android:state_enabled="false">
-                    <nine-patch android:src="@drawable/textfield_default_mtrl_alpha"
-                        android:tint="?attr/colorControlNormal"
-                        android:alpha="?attr/disabledAlpha" />
-                </item>
-                <item>
-                    <nine-patch android:src="@drawable/textfield_default_mtrl_alpha"
-                        android:tint="?attr/colorControlNormal" />
-                </item>
-            </selector>
+       android:insetLeft="@dimen/edit_text_inset_horizontal_material"
+       android:insetRight="@dimen/edit_text_inset_horizontal_material"
+       android:insetTop="@dimen/edit_text_inset_top_material"
+       android:insetBottom="@dimen/edit_text_inset_bottom_material">
+    <selector>
+        <item android:state_enabled="false">
+            <nine-patch android:src="@drawable/textfield_default_mtrl_alpha"
+                android:tint="?attr/colorControlNormal"
+                android:alpha="?attr/disabledAlpha" />
         </item>
-        <item android:id="@+id/mask" android:drawable="@drawable/textfield_activated_mtrl_alpha" />
-    </ripple>
+        <item android:state_pressed="false" android:state_focused="false">
+            <nine-patch android:src="@drawable/textfield_default_mtrl_alpha"
+                android:tint="?attr/colorControlNormal" />
+        </item>
+        <item>
+            <nine-patch android:src="@drawable/textfield_activated_mtrl_alpha"
+                android:tint="?attr/colorControlActivated" />
+        </item>
+    </selector>
 </inset>
diff --git a/core/res/res/values/colors_material.xml b/core/res/res/values/colors_material.xml
index 46ec83827e8b7..a8fd8d4e33c9b 100644
--- a/core/res/res/values/colors_material.xml
+++ b/core/res/res/values/colors_material.xml
@@ -22,7 +22,7 @@
     <color name="background_floating_material_light">#ffeeeeee</color>
 
     <color name="primary_material_dark">#ff212121</color>
-    <color name="primary_material_light">#ffe0e0e0</color>
+    <color name="primary_material_light">#ffefefef</color>
     <color name="primary_dark_material_dark">#ff000000</color>
     <color name="primary_dark_material_light">#ff757575</color>
 
diff --git a/core/res/res/values/dimens_material.xml b/core/res/res/values/dimens_material.xml
index 4a2119bf4a0e8..e3672c8ffc1c2 100644
--- a/core/res/res/values/dimens_material.xml
+++ b/core/res/res/values/dimens_material.xml
@@ -91,6 +91,10 @@
     <!-- Default rounded corner for controls -->
     <dimen name="control_corner_material">2dp</dimen>
 
+    <dimen name="edit_text_inset_horizontal_material">4dp</dimen>
+    <dimen name="edit_text_inset_top_material">4dp</dimen>
+    <dimen name="edit_text_inset_bottom_material">8dp</dimen>
+
     <dimen name="dialog_padding_material">24dp</dimen>
     <dimen name="dialog_padding_top_material">18dp</dimen>
 </resources>