Skip to content

Commit 0b72824

Browse files
author
Jim Miller
committed
Update status area and emergency call logic to match new spec
Change-Id: Ic43d9d58168166aacf2b145663dc9412b099f9c2
1 parent e364313 commit 0b72824

32 files changed

+334
-258
lines changed

‎core/res/res/layout-land/keyguard_widget_pager.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@
2828
android:clipChildren="false"
2929
android:clipToPadding="false"
3030
androidprv:pageSpacing="10dp">
31-
</com.android.internal.policy.impl.keyguard.KeyguardWidgetCarousel>
31+
</com.android.internal.policy.impl.keyguard.KeyguardWidgetCarousel>

‎core/res/res/layout-port/keyguard_host_view.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
android:paddingLeft="@dimen/keyguard_security_view_margin"
6868
android:paddingTop="@dimen/keyguard_security_view_margin"
6969
android:paddingRight="@dimen/keyguard_security_view_margin"
70-
android:paddingBottom="@dimen/keyguard_security_view_margin"
7170
android:gravity="center">
7271
</com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper>
7372
</com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer>

‎core/res/res/layout-port/keyguard_widget_pager.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@
2929
android:clipChildren="false"
3030
android:clipToPadding="false"
3131
androidprv:pageSpacing="10dp">
32-
</com.android.internal.policy.impl.keyguard.KeyguardWidgetPager>
32+
</com.android.internal.policy.impl.keyguard.KeyguardWidgetPager>

‎core/res/res/layout/keyguard_account_view.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
android:layout_height="match_parent"
2424
android:orientation="vertical">
2525

26-
<include layout="@layout/keyguard_sim_puk_pin_account_navigation"/>
26+
<include layout="@layout/keyguard_message_area"
27+
android:layout_width="match_parent"
28+
android:layout_height="wrap_content" />
2729

2830
<RelativeLayout
2931
android:layout_width="match_parent"

‎core/res/res/layout/keyguard_emergency_carrier_area.xml‎

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,39 @@
3636
android:textSize="@dimen/kg_status_line_font_size"
3737
android:textColor="?android:attr/textColorSecondary"/>
3838

39-
<com.android.internal.policy.impl.keyguard.EmergencyButton
40-
android:id="@+id/emergency_call_button"
41-
android:layout_width="wrap_content"
39+
<LinearLayout
40+
android:layout_width="match_parent"
4241
android:layout_height="wrap_content"
43-
android:drawableLeft="@*android:drawable/lockscreen_emergency_button"
44-
android:text="@string/kg_emergency_call_label"
45-
style="?android:attr/buttonBarButtonStyle"
46-
android:textAppearance="?android:attr/textAppearanceMedium"
47-
android:textSize="@dimen/kg_status_line_font_size"
48-
android:textColor="?android:attr/textColorSecondary"
49-
android:drawablePadding="8dip" />
42+
android:layout_marginTop="-10dip"
43+
style="?android:attr/buttonBarStyle"
44+
android:orientation="horizontal"
45+
android:gravity="center"
46+
android:weightSum="2">
47+
48+
<com.android.internal.policy.impl.keyguard.EmergencyButton
49+
android:id="@+id/emergency_call_button"
50+
android:layout_width="0dip"
51+
android:layout_height="wrap_content"
52+
android:layout_weight="1"
53+
android:drawableLeft="@*android:drawable/lockscreen_emergency_button"
54+
android:text="@string/kg_emergency_call_label"
55+
style="?android:attr/buttonBarButtonStyle"
56+
android:textAppearance="?android:attr/textAppearanceMedium"
57+
android:textSize="@dimen/kg_status_line_font_size"
58+
android:textColor="?android:attr/textColorSecondary"
59+
android:drawablePadding="8dip" />
60+
61+
<Button android:id="@+id/forgot_password_button"
62+
android:layout_width="0dip"
63+
android:layout_height="wrap_content"
64+
android:layout_weight="1"
65+
android:drawableLeft="@*android:drawable/lockscreen_forgot_password_button"
66+
style="?android:attr/buttonBarButtonStyle"
67+
android:textSize="@dimen/kg_status_line_font_size"
68+
android:textColor="?android:attr/textColorSecondary"
69+
android:textAppearance="?android:attr/textAppearanceMedium"
70+
android:drawablePadding="8dip"
71+
android:visibility="gone"/>
72+
</LinearLayout>
5073

5174
</LinearLayout>

‎core/res/res/layout/keyguard_emergency_carrier_area_and_recovery.xml‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎core/res/res/layout/keyguard_face_unlock_view.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@
2525
android:layout_width="match_parent"
2626
android:layout_height="match_parent">
2727

28-
<include layout="@layout/keyguard_navigation"/>
28+
<include layout="@layout/keyguard_message_area"
29+
android:layout_width="match_parent"
30+
android:layout_height="wrap_content"
31+
/>
2932

3033
<RelativeLayout
3134
android:id="@+id/face_unlock_area_view"

core/res/res/layout/keyguard_navigation.xml renamed to core/res/res/layout/keyguard_message_area.xml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,17 @@
1616
** limitations under the License.
1717
*/
1818
-->
19-
<merge xmlns:android="http://schemas.android.com/apk/res/android">
20-
<include layout="@layout/empty_navigation" />
21-
</merge>
19+
20+
<!-- This contains emergency call button and carrier as shared by pin/pattern/password screens -->
21+
<com.android.internal.policy.impl.keyguard.KeyguardMessageArea
22+
xmlns:android="http://schemas.android.com/apk/res/android"
23+
android:layout_width="match_parent"
24+
android:layout_height="wrap_content"
25+
android:gravity="center"
26+
android:id="@+id/keyguard_message_area"
27+
android:singleLine="true"
28+
android:ellipsize="marquee"
29+
android:textAppearance="?android:attr/textAppearance"
30+
android:textSize="@dimen/kg_status_line_font_size"
31+
android:textColor="?android:attr/textColorSecondary" />
32+

core/res/res/layout/empty_navigation.xml renamed to core/res/res/layout/keyguard_message_area_large.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,16 @@
1616
** limitations under the License.
1717
*/
1818
-->
19-
<merge xmlns:android="http://schemas.android.com/apk/res/android" />
19+
20+
<!-- This contains emergency call button and carrier as shared by pin/pattern/password screens -->
21+
<com.android.internal.policy.impl.keyguard.KeyguardMessageArea
22+
xmlns:android="http://schemas.android.com/apk/res/android"
23+
android:layout_width="match_parent"
24+
android:layout_height="wrap_content"
25+
android:gravity="center"
26+
android:id="@+id/keyguard_message_area"
27+
android:maxLines="4"
28+
android:textAppearance="?android:attr/textAppearance"
29+
android:textSize="@dimen/kg_status_line_font_size"
30+
android:textColor="?android:attr/textColorSecondary" />
31+

‎core/res/res/layout/keyguard_password_view.xml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,17 @@
2929
android:layout_height="0dp"
3030
android:layout_weight="1">
3131

32+
<include layout="@layout/keyguard_message_area"
33+
android:layout_width="match_parent"
34+
android:layout_height="wrap_content"
35+
/>
36+
3237
<LinearLayout
3338
android:layout_height="wrap_content"
3439
android:layout_width="match_parent"
3540
android:orientation="vertical"
3641
android:layout_gravity="center">
3742

38-
<LinearLayout
39-
android:layout_height="wrap_content"
40-
android:layout_width="match_parent"
41-
android:orientation="vertical"
42-
android:gravity="center">
43-
<include layout="@layout/keyguard_navigation"/>
44-
</LinearLayout>
45-
4643
<LinearLayout
4744
android:layout_width="match_parent"
4845
android:layout_height="wrap_content"

0 commit comments

Comments
 (0)