From 9cf1f37737163b75f25fe6bdda452dc39af8e293 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Tue, 5 Aug 2014 19:17:42 +0200
Subject: [PATCH] Update keyguard icon paddings to spec.

Bug: 15381387
Change-Id: Ia75394fd68f66233ebabe9ec4f62b42d40d19eb9
---
 .../SystemUI/res/layout/keyguard_bottom_area.xml     | 12 ++++++------
 packages/SystemUI/res/values-sw600dp/dimens.xml      |  4 ++++
 packages/SystemUI/res/values/dimens.xml              |  4 ++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index f8315702cdd8c..fc6e9aeff8df3 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -41,8 +41,8 @@
 
     <com.android.systemui.statusbar.KeyguardAffordanceView
         android:id="@+id/camera_button"
-        android:layout_height="64dp"
-        android:layout_width="64dp"
+        android:layout_height="@dimen/keyguard_affordance_height"
+        android:layout_width="@dimen/keyguard_affordance_width"
         android:layout_gravity="bottom|end"
         android:tint="#ffffffff"
         android:src="@drawable/ic_camera_alt_24dp"
@@ -51,8 +51,8 @@
 
     <com.android.systemui.statusbar.KeyguardAffordanceView
         android:id="@+id/phone_button"
-        android:layout_height="64dp"
-        android:layout_width="64dp"
+        android:layout_height="@dimen/keyguard_affordance_height"
+        android:layout_width="@dimen/keyguard_affordance_width"
         android:layout_gravity="bottom|start"
         android:tint="#ffffffff"
         android:src="@drawable/ic_phone_24dp"
@@ -61,8 +61,8 @@
 
     <com.android.systemui.statusbar.KeyguardAffordanceView
         android:id="@+id/lock_icon"
-        android:layout_width="64dp"
-        android:layout_height="64dp"
+        android:layout_width="@dimen/keyguard_affordance_width"
+        android:layout_height="@dimen/keyguard_affordance_height"
         android:layout_gravity="bottom|center_horizontal"
         android:src="@drawable/ic_lock_24dp"
         android:scaleType="center"
diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml
index 953a3abe8d0d4..1c60c18843402 100644
--- a/packages/SystemUI/res/values-sw600dp/dimens.xml
+++ b/packages/SystemUI/res/values-sw600dp/dimens.xml
@@ -80,4 +80,8 @@
 
     <!-- end margin for system icons if multi user switch is hidden -->
     <dimen name="system_icons_switcher_hidden_expanded_margin">20dp</dimen>
+
+    <!-- The width/height of the phone/camera/unlock icon on keyguard. -->
+    <dimen name="keyguard_affordance_height">80dp</dimen>
+    <dimen name="keyguard_affordance_width">120dp</dimen>
 </resources>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index f2c9e85f97f89..efddc62c78f1d 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -412,4 +412,8 @@
 
     <!-- How far the user needs to drag up to invoke search. -->
     <dimen name="search_panel_threshold">150dp</dimen>
+
+    <!-- The width/height of the phone/camera/unlock icon on keyguard. -->
+    <dimen name="keyguard_affordance_height">56dp</dimen>
+    <dimen name="keyguard_affordance_width">56dp</dimen>
 </resources>