commit baa23274596246d03741457701ac515a73aa8818
author Selim Cinek <cinek@google.com> Tue Jul 08 18:01:07 2014 +0200
committer Selim Cinek <cinek@google.com> Thu Jul 24 15:28:10 2014 +0000
tree 8ef64eb83f15bfbac46d1d9824a425691a42a8a4
parent 80440cc853611e77268d8c67db2279c10b2e076e

Implemented new camera affordance

Also fixed a bug in the touch logic where you could close the shade / hint
after going to the camera / phone.

Bug: 15126905
Change-Id: Iadfde56cb68f4048868eedec6bd3456f55823cd9

packages/SystemUI/res/layout/keyguard_bottom_area.xml

diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index db5983b..42fb740 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -22,7 +22,7 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     >
-    <com.android.systemui.statusbar.AlphaImageView
+    <com.android.systemui.statusbar.KeyguardAffordanceView
         android:id="@+id/camera_button"
         android:layout_height="64dp"
         android:layout_width="64dp"
@@ -32,7 +32,7 @@
         android:scaleType="center"
         android:contentDescription="@string/accessibility_camera_button" />
 
-    <com.android.systemui.statusbar.AlphaImageView
+    <com.android.systemui.statusbar.KeyguardAffordanceView
         android:id="@+id/phone_button"
         android:layout_height="64dp"
         android:layout_width="64dp"
@@ -52,7 +52,7 @@
         android:textColor="#ffffff"
         android:textAppearance="?android:attr/textAppearanceSmall"/>
 
-    <com.android.systemui.statusbar.AlphaImageView
+    <com.android.systemui.statusbar.KeyguardAffordanceView
         android:id="@+id/lock_icon"
         android:layout_width="64dp"
         android:layout_height="64dp"