From 50b9d8041598c76c788e9227df47a71ec0021060 Mon Sep 17 00:00:00 2001
From: Karl Rosaen <krosaen@android.com>
Date: Thu, 17 Sep 2009 02:56:57 -0700
Subject: [PATCH] First pass at pattern lock screen that includes date / time
 and carrier info (framework portion).

- layout's tweaked to squeeze carrier, time and date into pattern layout (landscape and portrait)
---
 core/res/res/drawable-hdpi/ic_emergency.png   | Bin 846 -> 3410 bytes
 .../keyguard_screen_unlock_landscape.xml      |  94 ++++++++++-----
 .../keyguard_screen_unlock_portrait.xml       | 109 ++++++++++++------
 3 files changed, 141 insertions(+), 62 deletions(-)

diff --git a/core/res/res/drawable-hdpi/ic_emergency.png b/core/res/res/drawable-hdpi/ic_emergency.png
index a2dd372c5a1f6b380fc1a3d06f1c047a79933c16..b4465ff12d27af8677ba2303635f7459320ee918 100644
GIT binary patch
literal 3410
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

literal 846
zcmV-U1F`&xP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!@JU2LRCwC#SxsmYK@|RGH@iuse+jWo
zYo)Z5Dkb2-lZf=>MNh?p-aL2`1U-p|f+%?L;H5%O-aUAe9L1|59{j_$NKu+vEYuoX
z8oHaE=j<kJe#p-@JIyAzFKhxckDdAEeQ&-u6GlYnW>e7R761qU1ONg6{#r=NTl8yq
zO&fSaoAV#&&rQ*y)^cNjafS^noMVYQGwgV&!+75E&`gGqS^8Bh(RPmoz8z;_BoVPE
zTVeJn>y*P53`>XFJIQ)-O3{mX03d}zTud(xT^&LcNs2hLrK-nnONxHsqn<L;Ip#DK
zKECGwBX%hN4Q&?0SP7i(IZ#EFX3=u|ICV}EQ-KezD6!w~l{!)Za77@n#7870cNrlr
zDdKV>KsGUG2VENh&XF&!DQ_~d{eIp_0H}-_<dQ<vNff$ny@gO%oJ9;5$`!VTeWonl
z3po>tebDyeC;>cBQ}Z7wd&`ZWgv56<YS=zX)%JfyIa%v{cG>Z0&ieGQ<x=8Z=wj3&
z+Kn?EgQ7fWm)SGQU>ASMG|pSE!YxOjADXTR#S~?Nw4`%uBckjGGe!4IA$z-P_v9t!
z0Fx>@hc6O60+`CDv&-rw-y+~<+@=&Vo!9sSfMfu0a=_jrd7D9q&BJn0Yd1X)3>@pt
zvC#y0NG&`?ZXWf6L?2=-Y-OUeQBM)jXHs+8>Ct;ol!g+U|NaZ+@*2!9KN?0$ON~LB
z8bxS)s9A*wb20OD@a6s7k)Mfw-+c!2>nhBpwO#Yu&xR|eO^yfvCzv)}Qs4OF8~z^Z
zSCq@xgyF1P3>p;FKVohb{8$Vnjhf(TpUdfrdbIKO*OBEkFH`H_JP<_Se~f^=laWjL
zck9>o2$b%KSpDm^;%yup$^lHm*wXGs`}GL=m}V%6-h-T|c*IERa0~-_#EM0GbSmrf
zJpxY2F`k4zF}x6&9=mO?bRDkk>@BW7*;`pR#IN^@QCUjtrv-m81pop70e}F2C;KPB
Y01D@8J{4Eup#T5?07*qoM6N<$f=zXO=l}o!

diff --git a/core/res/res/layout/keyguard_screen_unlock_landscape.xml b/core/res/res/layout/keyguard_screen_unlock_landscape.xml
index 929d0a22c61f5..6dd2949945007 100644
--- a/core/res/res/layout/keyguard_screen_unlock_landscape.xml
+++ b/core/res/res/layout/keyguard_screen_unlock_landscape.xml
@@ -21,7 +21,8 @@
      the user how to unlock their device, or make an emergency call.  This
      is the portrait layout.  -->
 
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -34,31 +35,70 @@
             android:layout_width="0dip"
             android:layout_height="fill_parent"
             android:layout_weight="1.0"
+            android:gravity="center_horizontal"
             >
+        <TextView
+            android:id="@+id/carrier"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorSecondary"
+            />
+        <TextView
+            android:id="@+id/centerDot"
+            android:visibility="gone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="17sp"
+            />
+        <TextView
+            android:id="@+id/time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="5dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="35sp"
+            />
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_marginTop="-12dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="17sp"
+            />
 
-        <!-- lock icon next to header text -->
-        <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="3dip"
-                android:gravity="center"
-                >
-            <ImageView android:id="@+id/unlockLockIcon"
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_marginRight="3dip"
-                       android:baselineAligned="true"
-                       android:gravity="center"
-                       android:src="@android:drawable/ic_lock_idle_lock"
-                    />
 
-            <TextView android:id="@+id/headerText"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:gravity="center"
-                      android:textSize="18sp"/>
-        </LinearLayout>
+        <View
+            android:id="@+id/divider"
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"
+            android:layout_centerHorizontal="true"
+            android:background="@android:drawable/divider_horizontal_dark"
+                />
+
+        <!-- lock icon and header message -->
+        <TextView
+            android:id="@+id/headerText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dip"
+            android:layout_centerHorizontal="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="17sp"
+            android:drawableLeft="@drawable/ic_lock_idle_lock"
+            android:drawablePadding="4dip"
+            android:gravity="center"
+            />
 
 
         <!-- fill space between header and button below -->
@@ -82,7 +122,7 @@
                 <Button android:id="@+id/emergencyCallAlone"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:text="@android:string/lockscreen_emergency_call"
+                    android:text="@string/lockscreen_emergency_call"
                     android:textSize="14sp"
                     android:drawableLeft="@drawable/ic_emergency"
                     android:drawablePadding="8dip"
@@ -105,7 +145,7 @@
                 <Button android:id="@+id/emergencyCallTogether"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:text="@android:string/lockscreen_emergency_call"
+                    android:text="@string/lockscreen_emergency_call"
                     android:textSize="14sp"
                     android:drawableLeft="@drawable/ic_emergency"
                     android:drawablePadding="8dip"
@@ -115,7 +155,7 @@
     </LinearLayout>
 
     <View
-         android:background="@android:drawable/code_lock_left"
+         android:background="@drawable/code_lock_left"
          android:layout_width="2dip"
          android:layout_height="fill_parent" />
 
@@ -124,4 +164,4 @@
          android:layout_width="wrap_content"
          android:layout_height="wrap_content" />
 
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
\ No newline at end of file
diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml
index a6c31b6c47255..a5d44fc376cb2 100644
--- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml
+++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml
@@ -23,54 +23,93 @@
 <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="wrap_content"
+    android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:gravity="center_horizontal"
     android:background="#A0000000"
         >
 
-    <!-- lock icon and header message -->
     <LinearLayout
+        android:id="@+id/carrierAndDate"
         android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1.0"
-        android:gravity="center"
-            >
-
-        <ImageView android:id="@+id/unlockLockIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="13dip"
+        >
+        <TextView
+            android:id="@+id/carrier"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="6dip"
-            android:baselineAligned="true"
-            android:gravity="center"
-            android:src="@android:drawable/ic_lock_idle_lock"
-        />
-
-        <TextView android:id="@+id/headerText"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="17sp"
+            />
+        <TextView
+            android:id="@+id/centerDot"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textSize="18sp"/>
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="17sp"
+            />
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="17sp"
+            />
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="-9dip"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textSize="48sp"
+        />
+
     <View
-         android:background="@android:drawable/code_lock_top"
-         android:layout_width="fill_parent"
-         android:layout_height="2dip" />
-    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
+        android:id="@+id/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1dip"
+        android:layout_marginTop="-4dip"
+        android:layout_centerHorizontal="true"
+        android:background="@android:drawable/divider_horizontal_dark"
+            />
+
+    <!-- lock icon and header message -->
+    <TextView
+        android:id="@+id/headerText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dip"
+        android:layout_centerHorizontal="true"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="17sp"
+        android:drawableLeft="@drawable/ic_lock_idle_lock"
+        android:drawablePadding="4dip"
+        />
+
+    <com.android.internal.widget.LockPatternView
+        android:id="@+id/lockPattern"
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:layout_marginTop="2dip"
          />
-    <View
-         android:background="@android:drawable/code_lock_bottom"
-         android:layout_width="fill_parent"
-         android:layout_height="8dip" />
 
     <!-- footer -->
     <FrameLayout
         android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1.0"
+        android:layout_height="wrap_content"
         >
 
         <!-- option 1: a single emergency call button -->
@@ -82,8 +121,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
-                android:text="@android:string/lockscreen_emergency_call"
-                android:textSize="14sp"
+                android:text="@string/lockscreen_emergency_call"
+                android:textAppearance="?android:attr/textAppearanceSmall"
                 android:drawableLeft="@drawable/ic_emergency"
                 android:drawablePadding="8dip"
                 />
@@ -105,8 +144,8 @@
                 android:layout_marginBottom="4dip"
                 android:layout_marginLeft="4dip"
                 android:layout_marginRight="2dip"
-                android:text="@android:string/lockscreen_emergency_call"
-                android:textSize="14sp"
+                android:text="@string/lockscreen_emergency_call"
+                android:textAppearance="?android:attr/textAppearanceSmall"
                 android:drawableLeft="@drawable/ic_emergency"
                 android:drawablePadding="8dip"
                 />
@@ -118,7 +157,7 @@
                 android:layout_marginBottom="4dip"
                 android:layout_marginLeft="2dip"
                 android:layout_marginRight="4dip"
-                android:textSize="14sp"
+                android:textAppearance="?android:attr/textAppearanceSmall"
                 android:visibility="invisible"
                 />
         </LinearLayout>