diff options
| author | Jim Miller <jaggies@google.com> | 2012-10-15 02:10:57 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2012-10-15 02:10:57 -0700 |
| commit | 87d57952af662a94637c1519b2189e22456af2db (patch) | |
| tree | 246041f6e3c8054202b785b09c86c3b12f3958d9 /core | |
| parent | 14bb25a3864d38da8f2b73180db649039558a37b (diff) | |
| download | frameworks_base-87d57952af662a94637c1519b2189e22456af2db.zip frameworks_base-87d57952af662a94637c1519b2189e22456af2db.tar.gz frameworks_base-87d57952af662a94637c1519b2189e22456af2db.tar.bz2 | |
Minor layout tweaks and bug fix in keyguard
- fix wrong string in SIM PUK unlock
- use buttonBar style for "emergency" and "forgot pattern" buttons
Bug 7341237
Change-Id: Id5593b54c345e3f869b6febc8554da01e7cb319e
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/layout/keyguard_emergency_carrier_area_and_recovery.xml | 20 |
1 files changed, 14 insertions, 6 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 e262486..68840ab 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> |