From cde52d77ebfee9229fa39cc0d8a0e6ad0c839212 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Mon, 26 May 2014 22:21:46 +0200
Subject: [PATCH] Replace KeyButtonView's custom glow with Quantum Ripple

Bug: 15212514
Change-Id: Ia66bccd627c123f637d67076f78ab418c3f9e835
---
 .../res/drawable-hdpi/ic_sysbar_highlight.png | Bin 3270 -> 0 bytes
 .../ic_sysbar_highlight_land.png              | Bin 3361 -> 0 bytes
 .../res/drawable-mdpi/ic_sysbar_highlight.png | Bin 1936 -> 0 bytes
 .../ic_sysbar_highlight_land.png              | Bin 1849 -> 0 bytes
 .../ic_sysbar_highlight.png                   | Bin 4767 -> 0 bytes
 .../ic_sysbar_highlight_land.png              | Bin 4506 -> 0 bytes
 .../ic_sysbar_highlight.png                   | Bin 2650 -> 0 bytes
 .../ic_sysbar_highlight_land.png              | Bin 2528 -> 0 bytes
 .../ic_sysbar_highlight.png                   | Bin 6316 -> 0 bytes
 .../ic_sysbar_highlight_land.png              | Bin 5734 -> 0 bytes
 .../ic_sysbar_highlight.png                   | Bin 8622 -> 0 bytes
 .../ic_sysbar_highlight_land.png              | Bin 7491 -> 0 bytes
 .../drawable-xhdpi/ic_sysbar_highlight.png    | Bin 4390 -> 0 bytes
 .../ic_sysbar_highlight_land.png              | Bin 4340 -> 0 bytes
 .../drawable-xxhdpi/ic_sysbar_highlight.png   | Bin 6225 -> 0 bytes
 .../ic_sysbar_highlight_land.png              | Bin 5571 -> 0 bytes
 .../SystemUI/res/drawable/ripple_drawable.xml |  21 +++
 .../res/layout-ldrtl/navigation_bar.xml       |  20 +--
 .../res/layout-sw600dp/navigation_bar.xml     |  20 +--
 .../res/layout/keyguard_bottom_area.xml       |   2 -
 .../SystemUI/res/layout/navigation_bar.xml    |  20 +--
 packages/SystemUI/res/values/attrs.xml        |   2 -
 .../statusbar/policy/KeyButtonView.java       | 144 ++++--------------
 23 files changed, 82 insertions(+), 147 deletions(-)
 delete mode 100644 packages/SystemUI/res/drawable-hdpi/ic_sysbar_highlight.png
 delete mode 100644 packages/SystemUI/res/drawable-hdpi/ic_sysbar_highlight_land.png
 delete mode 100644 packages/SystemUI/res/drawable-mdpi/ic_sysbar_highlight.png
 delete mode 100644 packages/SystemUI/res/drawable-mdpi/ic_sysbar_highlight_land.png
 delete mode 100644 packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight.png
 delete mode 100644 packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight_land.png
 delete mode 100644 packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight.png
 delete mode 100644 packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight_land.png
 delete mode 100644 packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight.png
 delete mode 100644 packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight_land.png
 delete mode 100644 packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_highlight.png
 delete mode 100644 packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_highlight_land.png
 delete mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_sysbar_highlight.png
 delete mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_sysbar_highlight_land.png
 delete mode 100644 packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_highlight.png
 delete mode 100644 packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_highlight_land.png
 create mode 100644 packages/SystemUI/res/drawable/ripple_drawable.xml

diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_highlight.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_highlight.png
deleted file mode 100644
index 8ddb37554c4b727cfa09ca1a30ba0250428f7f11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3270
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
CJ`h>}

diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_highlight_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_highlight_land.png
deleted file mode 100644
index 57a3b99f30e0dee8453b44482a507b0ef4564883..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3361
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

diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_highlight.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_highlight.png
deleted file mode 100644
index 71e1303d3605e3a8edb693d5ac33de4466b8ec18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1936
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
WVPtu6$z?nM0000<MNUMnLSTZq7L+3Z

diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_highlight_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_highlight_land.png
deleted file mode 100644
index 1de0a3a17f3889323f1ffc137eb35ac2abd77af4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1849
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

diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight.png
deleted file mode 100644
index 8014b707489849fd1f7f10116a0771046cfcc020..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4767
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

diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight_land.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_highlight_land.png
deleted file mode 100644
index 41a34e26f9d5fc97976db8bf9927287f47edf178..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4506
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
AP5=M^

diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight.png
deleted file mode 100644
index 9c623e5fb266a36b9463c99cdc44009f22338c39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2650
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
D(c{?-

diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight_land.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_highlight_land.png
deleted file mode 100644
index a011aa1beb9b2428604c072c0eb0813e5f31cbe9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2528
zcmdT``#;kS8~$R$EK2D~tjD3`6UGoSB4@K0BIQudWMLR8$}ES4Y$~G1q@1D$JvFnE
zLxvF@<S>V1gyhsJ*)a30_qX?l_YZhK_vgN^&vo7Rb>F|<H(XsDWM!0O0059hIoi65
z&{LH6q$Ndl1PwA10VvGM*$M#uAwvZLU=bIKb9b-?>fXY>iim2Eqq{QzTsaH?gfsxy
z5J`l20EkBbz=A&jAPWItAFlX?o4KeV8HjeU1-5@jX>-+WkpjUvo{bZs<A2h=2WtTU
z(oayfRvwqemM2CN#*KGLa#Ze2Yb1Ow{~FuROQEe58#~`+oGm_6d=5BhwW~m^yBZrN
zjKez;v(qs)lv{f9Phv@=u!%9&X=yP+++xd+okKRTPX(L4l}ey>3DKoZJYVT`%8;43
zg-6fBS}Dwh9{N}}y!+2^eOyfTt1LWq`8aC@BK!Akag$8a?cvm#rPMogxbx0pTJ5Em
z3W=?QH%w)Qv%P)TNfBtSeJZ(zU7Is%?VI&+$)k*#w&=uCxJt<-c~j?W+di#(k2{uA
z+&NJnl_D^nb93A1kEdBaKM!&%=;{&C8pv13ugSH}AFADlQ2IWRZ)O!diASuKJ9X98
z&ONd}alwCFOQ&qjzs{)kO?@g-eAMjCbQGAnROB>_BKVYc%Egzu^Oc`hAAN~QzSy`o
zfd)EU^sO_WxYkyHKu0!rJ1{DomchO<6YV+U8ocsb1140mJi6Po`*vhwze`ym+`k8*
z)|nsZq;_iXV=Rxd%PRt-kxRQPl%zOBP30D^!8>T)af~+$wGW2d?Ac!|Xs{o*`o!PE
zD)D|0{C)oFUDaPvY;hMea#u@(%fV60^r&StwcdTLYFm0_P|Q?=lzcC;U20S3UQ|2Q
zddsG;j4ju;58(CVGi`?Egu?l3a*^Dg%^6p=xU<=G`=lB9T#jON_Kb6-=PTBvZEuX?
z29)p)un=QF-ybpX!tI<(vu{AEznJg%3pCzE2?KPQi?B>Jsalgp#P_68Fo!%9zmGD_
zyC?267Q4tH&6{r2Jf-)Ycn6qE;lLdA>YPlOR+cHyy0iXW|Ax}=4z;HTA3m0&eK7Z$
zH6=ugANHEDv8EFex%o-Tl`+2zydiYb5^3I>bQc@chXzan#$a*6uqoaqq|J=K5b{ys
zq`0}6`V}=$PL;G21H|1e^!RdW@t=%M(ZG4JyV-}O&ZH&S;!nNmYuF>`{GuVK7LMqn
z87hDPVyV+%V-1NXH`%r9j*ApjH}9yI&5f?P@5ERrVV)0;mRLD1*BH~F5)lenP~hqU
zFEcD>*Y_m7o)S*9Nwk8wJ6*oDe*U_{Kh}2jzz@pzw<bV~-L{@FM#KD&K$f!;);2KZ
zZ;#*j;tCPc=acw8<yDtz&`g_lS;78IWx+lY{un?om3jeD_5=73Dc9`8W7iYc59|D7
zFKubpc?d0zXC7!_4KzKim#=%RGSzA-Or2@WUR}LERlijKoe{-RQ8yICheA2B50m(c
z@foaS@MD(?q5PNxqDolm{Hi7}`O2$0buA>5dAIa@s!jSesD$6G0|YE!sVX49KEZ}C
z1Bog&%S4(>DBxvY;yny??j;AHf*#4}d!#GYSnu#u%c$99<4Jm;)#17~@c&j`WI1y&
zXYpuquox$Mbpo_~bbK<vv+1ZZzsgf+(FsM2^q)MY7)VUX-R-4g`S@*y#AU@h%i-Bf
zW-}u&3|3-$f$UimModxCu*{3KzjV>SlKKbtNh5b?Q$lck@A8d^swu;D*<`gJWv*dq
znf-73v6;+0%#@52ou-@5SVbI_wJoT5cm%_tA~?NwDg3*f3dhf48t06(zKQw9pSC?_
z{);D@+}YB_HiL10&B6s>>UiM$s{sYBpVuMRibF=Q$$pq^s`cb#yO*ZKeRDXqDwlL_
zirYQ;;i$z{{geuHV+W=wVtr5uy(T@Qjuf|@a$7aecxZ4l^STcovn1IDh5acb^k~P-
zzXWqN3GeclD9^b{(GCudX&Ev%U|i=-Owrjy^A~2bKLyDKT_e=HSPWfW>JtkchspaT
zKJ5CLlO%V(fz8d|Jk#a7(hEaOf={-89T~Nr&@)qiktJ8c#J=jX={QShmU-W{y{8a5
z4JGinRU3XFs>EaKuHIadu67}OaQBL2TS!}TTI=2<M-HEtb3ia8IG!B;$pm3XIkI3U
z=1x2_Rw5>ULXWwquEQD+S7nhDI4c~?GMT&AsmIu^{Pl~AO$Q(Tl#I~3w2_r+!nNtx
zFW}<-pqTX2W4t-K&$eK@T0z}rd~N>K(ECck&(z(j2cLob6&UIFuTM|LHF9~)J}|Az
z*9UfLc5)`Q6Xa*E4i+%Ud4$<gO%~2}^(5g1NV#ZswK0vRK5*4-q(o-3a{RRXm45H>
zNW*BYYlan0C^ky}vrnNyEoj0JG*g4%sX0Em!v41X)_A?FVrCbXVdSb%`Fv8f{6Swb
z#DnM~Ub~!>rZhP}d;;C}JZlAP7uo_onLqpI$hjGvU~^~fhF^MjR*lO+%6er%W5hea
zsRxlqaC>fVpE0k@B^3ClS`5M}L5VbPhf;K;ChOB-?bvW5-(Wf>F9{JxInJwZezZHd
zXEpqjyxYn`$zpgd+$4WV(<;BxqXGTcE2pRTxxSHK)Wm)o^6RZ2(>vr=P{Z)3n}3f`
zv)8x!!lC@Xh&So^1=!_V1FacPKu^|81j@RlPRKg_^H}Y4P-I!SQJ=dqOdf^ouhBX(
za<A|?ttK2)f3`@ID*fn#9DKjlq2A-)Du#O8I3M&i*ae?u{KQPyx>mm4)Xuj?W97Km
zlV5%u$ih_|SgEEPX`LFh3P^fK?_5@VHd-Y1aX6uD@yfu)>0?iIoBXmyhl;HHd+174
zLev*2c330aN_SyUoTIV%cityGeLu?M1RQv#VNGRgE-^OeT!)caUW(VEIyRKC+h=_r
zsg4#@Dnw<8o)`_h-5Gpv06qj66dNJ}zyP6d2uGO0^$k4q4UtAikwyk^gb5OXaO>+(
z{x3shbnu1H%m3S;nwMN9GVK3-;Z$@eJ~1FR1h5K@4h&I6MFxb0xQ7G;UykVs`Tc1D
MC_5M1I%|L8zqps5=Kufz

diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight.png
deleted file mode 100644
index 61a36e3a814433f373557926052584083fe9749c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6316
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
B^6dZs

diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight_land.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_highlight_land.png
deleted file mode 100644
index 52bf290a1325b4f4d7fc0a4938435f2e9450df4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5734
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

diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_highlight.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_highlight.png
deleted file mode 100644
index e5d4273467b0335c357ab3d9c3570e7143041126..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8622
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

diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_highlight_land.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_highlight_land.png
deleted file mode 100644
index 1cc50097093532322bf9fa5a15fb434d949dcf81..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7491
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
Mx@=gX?;7*J03M%%w*UYD

diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_highlight.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_highlight.png
deleted file mode 100644
index c44aafc28330c9444b2073c5fe63bf00c9049912..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4390
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

diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_highlight_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_highlight_land.png
deleted file mode 100644
index 05da6da18f962a95c6f3ab83d035c717df53508b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4340
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

diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_highlight.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_highlight.png
deleted file mode 100644
index 0df6203c0d5c16b1d5fefa4879a72131fcd71faf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6225
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

diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_highlight_land.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_highlight_land.png
deleted file mode 100644
index b400b140c91280e4162a5b06efad9c9d1b757766..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5571
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
V+n&>&(Lb+Mu@<(NTC{iUe*u_$Mfd;!

diff --git a/packages/SystemUI/res/drawable/ripple_drawable.xml b/packages/SystemUI/res/drawable/ripple_drawable.xml
new file mode 100644
index 0000000000000..d2bff42c711ce
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ripple_drawable.xml
@@ -0,0 +1,21 @@
+<?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:tint="?android:attr/colorControlHighlight"
+        android:tintMode="src_over"
+        android:pinned="true" />
diff --git a/packages/SystemUI/res/layout-ldrtl/navigation_bar.xml b/packages/SystemUI/res/layout-ldrtl/navigation_bar.xml
index 5f1270666447d..84f09502addfc 100644
--- a/packages/SystemUI/res/layout-ldrtl/navigation_bar.xml
+++ b/packages/SystemUI/res/layout-ldrtl/navigation_bar.xml
@@ -55,7 +55,7 @@
                 systemui:keyCode="4"
                 android:layout_weight="0"
                 android:scaleType="center"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight"
+                android:background="@drawable/ripple_drawable"
                 android:contentDescription="@string/accessibility_back"
                 />
             <View 
@@ -71,7 +71,7 @@
                 systemui:keyCode="3"
                 systemui:keyRepeat="false"
                 android:layout_weight="0"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight"
+                android:background="@drawable/ripple_drawable"
                 android:contentDescription="@string/accessibility_home"
                 />
             <View 
@@ -85,7 +85,7 @@
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sysbar_recent"
                 android:layout_weight="0"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight"
+                android:background="@drawable/ripple_drawable"
                 android:contentDescription="@string/accessibility_recent"
                 />
             <FrameLayout
@@ -99,7 +99,7 @@
                     android:contentDescription="@string/accessibility_menu"
                     android:src="@drawable/ic_sysbar_menu"
                     android:visibility="invisible"
-                    systemui:glowBackground="@drawable/ic_sysbar_highlight"
+                    android:background="@drawable/ripple_drawable"
                     systemui:keyCode="82" />
                 <com.android.systemui.statusbar.policy.KeyButtonView
                     android:id="@+id/ime_switcher"
@@ -109,7 +109,7 @@
                     android:scaleType="centerInside"
                     android:src="@drawable/ic_ime_switcher_default"
                     android:visibility="invisible"
-                    systemui:glowBackground="@drawable/ic_sysbar_highlight" />
+                    android:background="@drawable/ripple_drawable" />
             </FrameLayout>
         </LinearLayout>
 
@@ -212,7 +212,7 @@
                     android:layout_weight="0"
                     android:visibility="invisible"
                     android:contentDescription="@string/accessibility_menu"
-                    systemui:glowBackground="@drawable/ic_sysbar_highlight_land" />
+                    android:background="@drawable/ripple_drawable" />
                 <com.android.systemui.statusbar.policy.KeyButtonView
                     android:id="@+id/ime_switcher"
                     android:layout_height="@dimen/navigation_extra_key_width"
@@ -221,7 +221,7 @@
                     android:scaleType="centerInside"
                     android:src="@drawable/ic_ime_switcher_default"
                     android:visibility="invisible"
-                    systemui:glowBackground="@drawable/ic_sysbar_highlight" />
+                    android:background="@drawable/ripple_drawable" />
             </FrameLayout>
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back"
                 android:layout_height="80dp"
@@ -231,7 +231,7 @@
                 systemui:keyCode="4"
                 android:layout_weight="0"
                 android:contentDescription="@string/accessibility_back"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight_land"
+                android:background="@drawable/ripple_drawable"
                 />
             <View
                 android:layout_height="match_parent"
@@ -247,7 +247,7 @@
                 systemui:keyRepeat="false"
                 android:layout_weight="0"
                 android:contentDescription="@string/accessibility_home"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight_land"
+                android:background="@drawable/ripple_drawable"
                 />
             <View 
                 android:layout_height="match_parent"
@@ -261,7 +261,7 @@
                 android:src="@drawable/ic_sysbar_recent_land"
                 android:layout_weight="0"
                 android:contentDescription="@string/accessibility_recent"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight_land"
+                android:background="@drawable/ripple_drawable"
                 />
             <View
                 android:layout_height="40dp"
diff --git a/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml b/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
index 6a2e3c6a854d0..34b674b20b9b6 100644
--- a/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
+++ b/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
@@ -59,7 +59,7 @@
                 android:src="@drawable/ic_sysbar_back"
                 systemui:keyCode="4"
                 android:layout_weight="0"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight"
+                android:background="@drawable/ripple_drawable"
                 android:contentDescription="@string/accessibility_back"
                 />
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home"
@@ -69,7 +69,7 @@
                 systemui:keyCode="3"
                 systemui:keyRepeat="true"
                 android:layout_weight="0"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight"
+                android:background="@drawable/ripple_drawable"
                 android:contentDescription="@string/accessibility_home"
                 />
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps"
@@ -77,7 +77,7 @@
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sysbar_recent"
                 android:layout_weight="0"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight"
+                android:background="@drawable/ripple_drawable"
                 android:contentDescription="@string/accessibility_recent"
                 />
             <Space 
@@ -98,7 +98,7 @@
                     systemui:keyCode="82"
                     android:visibility="invisible"
                     android:contentDescription="@string/accessibility_menu"
-                    systemui:glowBackground="@drawable/ic_sysbar_highlight"
+                    android:background="@drawable/ripple_drawable"
                     />
                 <com.android.systemui.statusbar.policy.KeyButtonView
                     android:id="@+id/ime_switcher"
@@ -109,7 +109,7 @@
                     android:src="@drawable/ic_ime_switcher_default"
                     android:visibility="invisible"
                     android:contentDescription="@string/accessibility_ime_switch_button"
-                    systemui:glowBackground="@drawable/ic_sysbar_highlight" />
+                    android:background="@drawable/ripple_drawable" />
             </FrameLayout>
         </LinearLayout>
 
@@ -216,7 +216,7 @@
                 android:src="@drawable/ic_sysbar_back"
                 systemui:keyCode="4"
                 android:layout_weight="0"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight"
+                android:background="@drawable/ripple_drawable"
                 android:contentDescription="@string/accessibility_back"
                 />
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home"
@@ -226,7 +226,7 @@
                 systemui:keyCode="3"
                 systemui:keyRepeat="true"
                 android:layout_weight="0"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight"
+                android:background="@drawable/ripple_drawable"
                 android:contentDescription="@string/accessibility_home"
                 />
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps"
@@ -234,7 +234,7 @@
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sysbar_recent"
                 android:layout_weight="0"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight"
+                android:background="@drawable/ripple_drawable"
                 android:contentDescription="@string/accessibility_recent"
                 />
             <Space 
@@ -255,7 +255,7 @@
                     systemui:keyCode="82"
                     android:visibility="invisible"
                     android:contentDescription="@string/accessibility_menu"
-                    systemui:glowBackground="@drawable/ic_sysbar_highlight"
+                    android:background="@drawable/ripple_drawable"
                     />
                 <com.android.systemui.statusbar.policy.KeyButtonView
                     android:id="@+id/ime_switcher"
@@ -266,7 +266,7 @@
                     android:visibility="invisible"
                     android:contentDescription="@string/accessibility_ime_switch_button"
                     android:scaleType="centerInside"
-                    systemui:glowBackground="@drawable/ic_sysbar_highlight" />
+                    android:background="@drawable/ripple_drawable" />
             </FrameLayout>
         </LinearLayout>
 
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index 2ec3766a722dc..73c8109e0f94c 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -31,7 +31,6 @@
         android:src="@drawable/ic_camera_alt_24dp"
         android:scaleType="center"
         android:contentDescription="@string/accessibility_camera_button"
-        systemui:glowBackground="@drawable/ic_sysbar_highlight_land"
         systemui:swipeDirection="start"/>
 
     <com.android.systemui.statusbar.phone.SwipeAffordanceView
@@ -43,7 +42,6 @@
         android:src="@drawable/ic_phone_24dp"
         android:scaleType="center"
         android:contentDescription="@string/accessibility_phone_button"
-        systemui:glowBackground="@drawable/ic_sysbar_highlight_land"
         systemui:swipeDirection="end"/>
 
     <com.android.systemui.statusbar.phone.KeyguardIndicationTextView
diff --git a/packages/SystemUI/res/layout/navigation_bar.xml b/packages/SystemUI/res/layout/navigation_bar.xml
index 74704090aa5a6..fa6f7f5ac0c3a 100644
--- a/packages/SystemUI/res/layout/navigation_bar.xml
+++ b/packages/SystemUI/res/layout/navigation_bar.xml
@@ -55,7 +55,7 @@
                 systemui:keyCode="4"
                 android:layout_weight="0"
                 android:scaleType="center"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight"
+                android:background="@drawable/ripple_drawable"
                 android:contentDescription="@string/accessibility_back"
                 />
             <View 
@@ -71,7 +71,7 @@
                 systemui:keyCode="3"
                 systemui:keyRepeat="false"
                 android:layout_weight="0"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight"
+                android:background="@drawable/ripple_drawable"
                 android:contentDescription="@string/accessibility_home"
                 />
             <View 
@@ -85,7 +85,7 @@
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sysbar_recent"
                 android:layout_weight="0"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight"
+                android:background="@drawable/ripple_drawable"
                 android:contentDescription="@string/accessibility_recent"
                 />
             <FrameLayout
@@ -99,7 +99,7 @@
                     android:contentDescription="@string/accessibility_menu"
                     android:src="@drawable/ic_sysbar_menu"
                     android:visibility="invisible"
-                    systemui:glowBackground="@drawable/ic_sysbar_highlight"
+                    android:background="@drawable/ripple_drawable"
                     systemui:keyCode="82" />
 
                 <com.android.systemui.statusbar.policy.KeyButtonView
@@ -110,7 +110,7 @@
                     android:scaleType="centerInside"
                     android:src="@drawable/ic_ime_switcher_default"
                     android:visibility="invisible"
-                    systemui:glowBackground="@drawable/ic_sysbar_highlight" />
+                    android:background="@drawable/ripple_drawable" />
             </FrameLayout>
 
         </LinearLayout>
@@ -219,7 +219,7 @@
                     android:scaleType="centerInside"
                     android:src="@drawable/ic_ime_switcher_default"
                     android:visibility="invisible"
-                    systemui:glowBackground="@drawable/ic_sysbar_highlight" />
+                    android:background="@drawable/ripple_drawable" />
 
                 <com.android.systemui.statusbar.policy.KeyButtonView
                     android:id="@+id/menu"
@@ -228,7 +228,7 @@
                     android:contentDescription="@string/accessibility_menu"
                     android:src="@drawable/ic_sysbar_menu_land"
                     android:visibility="invisible"
-                    systemui:glowBackground="@drawable/ic_sysbar_highlight_land"
+                    android:background="@drawable/ripple_drawable"
                     systemui:keyCode="82" />
             </FrameLayout>
 
@@ -238,7 +238,7 @@
                 android:src="@drawable/ic_sysbar_recent_land"
                 android:layout_weight="0"
                 android:contentDescription="@string/accessibility_recent"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight_land"
+                android:background="@drawable/ripple_drawable"
                 />
             <View 
                 android:layout_height="match_parent"
@@ -254,7 +254,7 @@
                 systemui:keyRepeat="false"
                 android:layout_weight="0"
                 android:contentDescription="@string/accessibility_home"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight_land"
+                android:background="@drawable/ripple_drawable"
                 />
             <View 
                 android:layout_height="match_parent"
@@ -270,7 +270,7 @@
                 systemui:keyCode="4"
                 android:layout_weight="0"
                 android:contentDescription="@string/accessibility_back"
-                systemui:glowBackground="@drawable/ic_sysbar_highlight_land"
+                android:background="@drawable/ripple_drawable"
                 />
             <View
                 android:layout_height="40dp"
diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml
index 8fd120689b633..35496897b94c6 100644
--- a/packages/SystemUI/res/values/attrs.xml
+++ b/packages/SystemUI/res/values/attrs.xml
@@ -20,8 +20,6 @@
         <attr name="keyCode" format="integer" />
         <!-- does this button generate longpress / repeat events? -->
         <attr name="keyRepeat" format="boolean" />
-        <!-- drawable to use for a swelling, glowing background on press -->
-        <attr name="glowBackground" format="reference" />
     </declare-styleable>
     <declare-styleable name="ToggleSlider">
         <attr name="text" format="string" />
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
index 718acc3c42693..330b599fe3b99 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
@@ -17,12 +17,9 @@
 package com.android.systemui.statusbar.policy;
 
 import android.animation.Animator;
-import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.hardware.input.InputManager;
 import android.os.SystemClock;
@@ -34,9 +31,7 @@ import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.SoundEffectConstants;
-import android.view.View;
 import android.view.ViewConfiguration;
-import android.view.ViewDebug;
 import android.view.accessibility.AccessibilityEvent;
 import android.widget.ImageView;
 
@@ -46,25 +41,18 @@ public class KeyButtonView extends ImageView {
     private static final String TAG = "StatusBar.KeyButtonView";
     private static final boolean DEBUG = false;
 
-    final float GLOW_MAX_SCALE_FACTOR = 1.8f;
     public static final float DEFAULT_QUIESCENT_ALPHA = 0.70f;
 
-    long mDownTime;
-    int mCode;
-    int mTouchSlop;
-    Drawable mGlowBG;
-    int mGlowWidth, mGlowHeight;
-    float mGlowAlpha = 0f, mGlowScale = 1f;
-    @ViewDebug.ExportedProperty(category = "drawing")
-    float mDrawingAlpha = 1f;
-    @ViewDebug.ExportedProperty(category = "drawing")
-    float mQuiescentAlpha = DEFAULT_QUIESCENT_ALPHA;
-    boolean mSupportsLongpress = true;
-    RectF mRect = new RectF();
-    AnimatorSet mPressedAnim;
-    Animator mAnimateToQuiescent = new ObjectAnimator();
+    private long mDownTime;
+    private int mCode;
+    private int mTouchSlop;
+    private float mDrawingAlpha = 1f;
+    private float mQuiescentAlpha = DEFAULT_QUIESCENT_ALPHA;
+    private boolean mSupportsLongpress = true;
+    private Animator mAnimateToQuiescent = new ObjectAnimator();
+    private Drawable mBackground;
 
-    Runnable mCheckLongPress = new Runnable() {
+    private final Runnable mCheckLongPress = new Runnable() {
         public void run() {
             if (isPressed()) {
                 // Log.d("KeyButtonView", "longpressed: " + this);
@@ -93,47 +81,27 @@ public class KeyButtonView extends ImageView {
 
         mSupportsLongpress = a.getBoolean(R.styleable.KeyButtonView_keyRepeat, true);
 
-        mGlowBG = a.getDrawable(R.styleable.KeyButtonView_glowBackground);
-        setDrawingAlpha(mQuiescentAlpha);
-        if (mGlowBG != null) {
-            mGlowWidth = mGlowBG.getIntrinsicWidth();
-            mGlowHeight = mGlowBG.getIntrinsicHeight();
+        Drawable d = getBackground();
+        if (d != null) {
+            mBackground = d.mutate();
+            setBackground(mBackground);
         }
 
+        setDrawingAlpha(mQuiescentAlpha);
+
         a.recycle();
 
         setClickable(true);
         mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
     }
 
-    @Override
-    protected void onDraw(Canvas canvas) {
-        if (mGlowBG != null) {
-            canvas.save();
-            final int w = getWidth();
-            final int h = getHeight();
-            final float aspect = (float)mGlowWidth / mGlowHeight;
-            final int drawW = (int)(h*aspect);
-            final int drawH = h;
-            final int margin = (drawW-w)/2;
-            canvas.scale(mGlowScale, mGlowScale, w*0.5f, h*0.5f);
-            mGlowBG.setBounds(-margin, 0, drawW-margin, drawH);
-            mGlowBG.setAlpha((int)(mDrawingAlpha * mGlowAlpha * 255));
-            mGlowBG.draw(canvas);
-            canvas.restore();
-            mRect.right = w;
-            mRect.bottom = h;
-        }
-        super.onDraw(canvas);
-    }
-
     public void setQuiescentAlpha(float alpha, boolean animate) {
         mAnimateToQuiescent.cancel();
         alpha = Math.min(Math.max(alpha, 0), 1);
         if (alpha == mQuiescentAlpha && alpha == mDrawingAlpha) return;
         mQuiescentAlpha = alpha;
         if (DEBUG) Log.d(TAG, "New quiescent alpha = " + mQuiescentAlpha);
-        if (mGlowBG != null && animate) {
+        if (mBackground != null && animate) {
             mAnimateToQuiescent = animateToQuiescent();
             mAnimateToQuiescent.start();
         } else {
@@ -154,87 +122,35 @@ public class KeyButtonView extends ImageView {
     }
 
     public void setDrawingAlpha(float x) {
-        // Calling setAlpha(int), which is an ImageView-specific
-        // method that's different from setAlpha(float). This sets
-        // the alpha on this ImageView's drawable directly
-        setAlpha((int) (x * 255));
+        setImageAlpha((int) (x * 255));
+        if (mBackground != null) {
+            mBackground.setAlpha((int)(x * 255));
+        }
         mDrawingAlpha = x;
     }
 
-    public float getGlowAlpha() {
-        if (mGlowBG == null) return 0;
-        return mGlowAlpha;
-    }
-
-    public void setGlowAlpha(float x) {
-        if (mGlowBG == null) return;
-        mGlowAlpha = x;
-        invalidate();
-    }
-
-    public float getGlowScale() {
-        if (mGlowBG == null) return 0;
-        return mGlowScale;
-    }
-
-    public void setGlowScale(float x) {
-        if (mGlowBG == null) return;
-        mGlowScale = x;
-        final float w = getWidth();
-        final float h = getHeight();
-        if (GLOW_MAX_SCALE_FACTOR <= 1.0f) {
-            // this only works if we know the glow will never leave our bounds
-            invalidate();
-        } else {
-            final float rx = (w * (GLOW_MAX_SCALE_FACTOR - 1.0f)) / 2.0f + 1.0f;
-            final float ry = (h * (GLOW_MAX_SCALE_FACTOR - 1.0f)) / 2.0f + 1.0f;
-            com.android.systemui.SwipeHelper.invalidateGlobalRegion(
-                    this,
-                    new RectF(getLeft() - rx,
-                              getTop() - ry,
-                              getRight() + rx,
-                              getBottom() + ry));
-
-            // also invalidate our immediate parent to help avoid situations where nearby glows
-            // interfere
-            ((View)getParent()).invalidate();
-        }
-    }
-
     public void setPressed(boolean pressed) {
-        if (mGlowBG != null) {
+        if (mBackground != null) {
             if (pressed != isPressed()) {
-                if (mPressedAnim != null && mPressedAnim.isRunning()) {
-                    mPressedAnim.cancel();
-                }
-                final AnimatorSet as = mPressedAnim = new AnimatorSet();
                 if (pressed) {
-                    if (mGlowScale < GLOW_MAX_SCALE_FACTOR)
-                        mGlowScale = GLOW_MAX_SCALE_FACTOR;
-                    if (mGlowAlpha < mQuiescentAlpha)
-                        mGlowAlpha = mQuiescentAlpha;
                     setDrawingAlpha(1f);
-                    as.playTogether(
-                        ObjectAnimator.ofFloat(this, "glowAlpha", 1f),
-                        ObjectAnimator.ofFloat(this, "glowScale", GLOW_MAX_SCALE_FACTOR)
-                    );
-                    as.setDuration(50);
                 } else {
                     mAnimateToQuiescent.cancel();
                     mAnimateToQuiescent = animateToQuiescent();
-                    as.playTogether(
-                        ObjectAnimator.ofFloat(this, "glowAlpha", 0f),
-                        ObjectAnimator.ofFloat(this, "glowScale", 1f),
-                        mAnimateToQuiescent
-                    );
-                    as.setDuration(500);
+                    mAnimateToQuiescent.setDuration(500);
+                    mAnimateToQuiescent.start();
                 }
-                as.start();
             }
         }
         super.setPressed(pressed);
     }
 
+    private void setHotspot(float x, float y) {
+        if (mBackground != null) {
+            mBackground.setHotspot(x, y);
+        }
+    }
+
     public boolean onTouchEvent(MotionEvent ev) {
         final int action = ev.getAction();
         int x, y;
@@ -254,6 +170,7 @@ public class KeyButtonView extends ImageView {
                     removeCallbacks(mCheckLongPress);
                     postDelayed(mCheckLongPress, ViewConfiguration.getLongPressTimeout());
                 }
+                setHotspot(ev.getX(), ev.getY());
                 break;
             case MotionEvent.ACTION_MOVE:
                 x = (int)ev.getX();
@@ -262,6 +179,7 @@ public class KeyButtonView extends ImageView {
                         && x < getWidth() + mTouchSlop
                         && y >= -mTouchSlop
                         && y < getHeight() + mTouchSlop);
+                setHotspot(ev.getX(), ev.getY());
                 break;
             case MotionEvent.ACTION_CANCEL:
                 setPressed(false);