Fixing issues with pattern recovery / account view (issue 7341237):

-> Recovery button should only appear if account present
-> Recovery button should appear at bottom
-> Account view should have emergency call button
-> Account view should not show the clock / status area

Change-Id: Id12e8219f3fc6ecb14e82c5ec6ea4b3e28ed772d

10 files changed, 82 insertions, 23 deletions

diff --git a/core/res/res/layout/keyguard_account_view.xml b/core/res/res/layout/keyguard_account_view.xml
index 481f0c1..d1f9225 100644
--- a/core/res/res/layout/keyguard_account_view.xml
+++ b/core/res/res/layout/keyguard_account_view.xml
@@ -23,7 +23,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <include layout="@layout/keyguard_navigation"/>
+    <include layout="@layout/keyguard_sim_puk_pin_account_navigation"/>
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -69,4 +69,12 @@
 
     </RelativeLayout>
 
+    <include layout="@layout/keyguard_emergency_carrier_area"
+        android:id="@+id/keyguard_selector_fade_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_gravity="bottom|center_horizontal"
+        android:gravity="center_horizontal" />
+
 </com.android.internal.policy.impl.keyguard.KeyguardAccountView>
diff --git a/core/res/res/layout/keyguard_emergency_carrier_area_and_recovery.xml b/core/res/res/layout/keyguard_emergency_carrier_area_and_recovery.xml
new file mode 100644
index 0000000..e262486
--- /dev/null
+++ b/core/res/res/layout/keyguard_emergency_carrier_area_and_recovery.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2012, 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.
+*/
+-->
+
+<!-- This contains emergency call button and carrier as shared by pin/pattern/password screens -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:gravity="center"
+    android:layout_gravity="center_horizontal"
+    android:layout_alignParentBottom="true">
+
+    <com.android.internal.policy.impl.keyguard.CarrierText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textSize="@dimen/kg_status_line_font_size"
+        android:textColor="?android:attr/textColorSecondary"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <com.android.internal.policy.impl.keyguard.EmergencyButton
+            android:id="@+id/emergency_call_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableLeft="@*android:drawable/lockscreen_emergency_button"
+            android:text="@string/kg_emergency_call_label"
+            style="?android:attr/buttonBarButtonStyle"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="@dimen/kg_status_line_font_size"
+            android:textColor="?android:attr/textColorSecondary"
+            android:drawablePadding="8dip" />
+
+        <Button android:id="@+id/forgot_password_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:textSize="@dimen/kg_status_line_font_size"
+            android:visibility="gone"/>
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/core/res/res/layout/keyguard_pattern_view.xml b/core/res/res/layout/keyguard_pattern_view.xml
index 47dea9f..bec03b4 100644
--- a/core/res/res/layout/keyguard_pattern_view.xml
+++ b/core/res/res/layout/keyguard_pattern_view.xml
@@ -38,21 +38,7 @@
             android:orientation="vertical"
             android:layout_gravity="center">
 
-            <LinearLayout
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:orientation="vertical"
-                android:gravity="center">
-
-                <include layout="@layout/keyguard_navigation"/>
-
-                <Button android:id="@+id/forgot_password_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/kg_status_line_font_size"
-                    android:visibility="gone"/>
-
-            </LinearLayout>
+            <include layout="@layout/keyguard_navigation"/>
 
             <!-- We need MATCH_PARENT here only to force the size of the parent to be passed to
             the pattern view for it to compute its size. This is an unusual case, caused by
@@ -69,7 +55,7 @@
                 android:layout_gravity="center_horizontal"
                 android:gravity="center" />
 
-            <include layout="@layout/keyguard_emergency_carrier_area"
+            <include layout="@layout/keyguard_emergency_carrier_area_and_recovery"
                 android:id="@+id/keyguard_selector_fade_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/core/res/res/layout/keyguard_sim_pin_view.xml b/core/res/res/layout/keyguard_sim_pin_view.xml
index 82268ad..163dc15 100644
--- a/core/res/res/layout/keyguard_sim_pin_view.xml
+++ b/core/res/res/layout/keyguard_sim_pin_view.xml
@@ -43,7 +43,7 @@
                 android:layout_height="wrap_content"
                 android:src="@drawable/ic_lockscreen_sim"/>
 
-            <include layout="@layout/keyguard_sim_puk_pin_navigation"/>
+            <include layout="@layout/keyguard_sim_puk_pin_account_navigation"/>
          </LinearLayout>
 
         <!-- Password entry field -->
diff --git a/core/res/res/layout/keyguard_sim_puk_pin_navigation.xml b/core/res/res/layout/keyguard_sim_puk_pin_account_navigation.xml
index 2e6fa37..2e6fa37 100644
--- a/core/res/res/layout/keyguard_sim_puk_pin_navigation.xml
+++ b/core/res/res/layout/keyguard_sim_puk_pin_account_navigation.xml
diff --git a/core/res/res/layout/keyguard_sim_puk_view.xml b/core/res/res/layout/keyguard_sim_puk_view.xml
index 6404efc..6e45b0b 100644
--- a/core/res/res/layout/keyguard_sim_puk_view.xml
+++ b/core/res/res/layout/keyguard_sim_puk_view.xml
@@ -44,7 +44,7 @@
                 android:layout_height="wrap_content"
                 android:src="@drawable/ic_lockscreen_sim"/>
 
-            <include layout="@layout/keyguard_sim_puk_pin_navigation"/>
+            <include layout="@layout/keyguard_sim_puk_pin_account_navigation"/>
 
          </LinearLayout>
 
diff --git a/core/res/res/values-land/bools.xml b/core/res/res/values-land/bools.xml
index 4dd9369..b0630ad 100644
--- a/core/res/res/values-land/bools.xml
+++ b/core/res/res/values-land/bools.xml
@@ -16,5 +16,5 @@
 
 <resources>
     <bool name="kg_share_status_area">false</bool>
-    <bool name="kg_sim_puk_full_screen">false</bool>
+    <bool name="kg_sim_puk_account_full_screen">false</bool>
 </resources>
diff --git a/core/res/res/values-port/bools.xml b/core/res/res/values-port/bools.xml
index 1597af3..1e2a4f2 100644
--- a/core/res/res/values-port/bools.xml
+++ b/core/res/res/values-port/bools.xml
@@ -17,5 +17,5 @@
 <resources>
     <bool name="action_bar_embed_tabs">false</bool>
     <bool name="kg_share_status_area">true</bool>
-    <bool name="kg_sim_puk_full_screen">true</bool>
+    <bool name="kg_sim_puk_account_full_screen">true</bool>
 </resources>
diff --git a/core/res/res/values-sw600dp/bools.xml b/core/res/res/values-sw600dp/bools.xml
index 355c52c..3753aba 100644
--- a/core/res/res/values-sw600dp/bools.xml
+++ b/core/res/res/values-sw600dp/bools.xml
@@ -18,5 +18,5 @@
     <bool name="target_honeycomb_needs_options_menu">false</bool>
     <bool name="show_ongoing_ime_switcher">true</bool>
     <bool name="kg_share_status_area">false</bool>
-    <bool name="kg_sim_puk_full_screen">false</bool>
+    <bool name="kg_sim_puk_account_full_screen">false</bool>
 </resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 61838cc..e76b67b 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1192,7 +1192,7 @@
   <java-symbol type="bool" name="config_reverseDefaultRotation" />
   <java-symbol type="bool" name="config_showNavigationBar" />
   <java-symbol type="bool" name="kg_share_status_area" />
-  <java-symbol type="bool" name="kg_sim_puk_full_screen" />  
+  <java-symbol type="bool" name="kg_sim_puk_account_full_screen" />  
   <java-symbol type="bool" name="target_honeycomb_needs_options_menu" />
   <java-symbol type="color" name="kg_multi_user_text_active" />
   <java-symbol type="color" name="kg_multi_user_text_inactive" />