diff options
| -rw-r--r-- | core/res/res/layout/keyguard_emergency_carrier_area_and_recovery.xml | 20 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPukView.java | 2 |
2 files changed, 15 insertions, 7 deletions
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 index e262486881a6..68840abc051b 100644 --- a/core/res/res/layout/keyguard_emergency_carrier_area_and_recovery.xml +++ b/core/res/res/layout/keyguard_emergency_carrier_area_and_recovery.xml @@ -37,14 +37,18 @@ android:textColor="?android:attr/textColorSecondary"/> <LinearLayout - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> + style="?android:attr/buttonBarStyle" + android:orientation="horizontal" + android:gravity="center" + android:weightSum="2"> <com.android.internal.policy.impl.keyguard.EmergencyButton android:id="@+id/emergency_call_button" - android:layout_width="wrap_content" + android:layout_width="0dip" android:layout_height="wrap_content" + android:layout_weight="1" android:drawableLeft="@*android:drawable/lockscreen_emergency_button" android:text="@string/kg_emergency_call_label" style="?android:attr/buttonBarButtonStyle" @@ -54,11 +58,15 @@ android:drawablePadding="8dip" /> <Button android:id="@+id/forgot_password_button" - android:layout_width="wrap_content" + android:layout_width="0dip" android:layout_height="wrap_content" - android:paddingLeft="20dp" - android:paddingRight="20dp" + android:layout_weight="1" + android:drawableLeft="@drawable/lockscreen_forgot_password_button" + style="?android:attr/buttonBarButtonStyle" android:textSize="@dimen/kg_status_line_font_size" + android:textColor="?android:attr/textColorSecondary" + android:textAppearance="?android:attr/textAppearanceMedium" + android:drawablePadding="8dip" android:visibility="gone"/> </LinearLayout> diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPukView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPukView.java index c0eb3819a230..562d8931e2a3 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPukView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPukView.java @@ -91,7 +91,7 @@ public class KeyguardSimPukView extends LinearLayout implements View.OnClickList } else if (state == CONFIRM_PIN) { if (confirmPin()) { state = DONE; - msg = R.string.kg_login_checking_password; + msg = R.string.lockscreen_sim_unlock_progress_dialog_message; updateSim(); } else { msg = R.string.kg_invalid_confirm_pin_hint; |