Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 87d57952: Minor layout tweaks and bug fix in keyguard

Browse Source 
* commit '87d57952af662a94637c1519b2189e22456af2db':
  Minor layout tweaks and bug fix in keyguard
This commit is contained in:
Jim Miller
2012-10-15 02:31:04 -07:00
committed by Android Git Automerger
parent 63b977de7e 87d57952af
commit 1deaf3c710
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/res/res/layout/keyguard_emergency_carrier_area_and_recovery.xml
View File

@@ -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>

2
policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPukView.java
View File

@@ -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;