diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-11-07 21:18:35 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-07 21:18:44 -0800 |
| commit | 838195db8f69968690971977e4b615df39504465 (patch) | |
| tree | 9d5d732b47a3f0826ae383d91d92f7c2762d9169 | |
| parent | 9eacab8abee6b8d154f5de2513fcbaed313c4b24 (diff) | |
| parent | cf2b7a261d9d4db346a73c11eeb3ae73bb11ebb6 (diff) | |
| download | base-838195db8f69968690971977e4b615df39504465.tar.gz | |
Merge "Compress lockscreen's account login fallback to fit." into jb-mr1-lockscreen-dev
| -rw-r--r-- | core/res/res/layout/keyguard_account_view.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/res/res/layout/keyguard_account_view.xml b/core/res/res/layout/keyguard_account_view.xml index 17175caa2dc8..8bc1da297350 100644 --- a/core/res/res/layout/keyguard_account_view.xml +++ b/core/res/res/layout/keyguard_account_view.xml @@ -51,6 +51,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/login" + android:layout_toLeftOf="@+id/ok" android:layout_marginTop="15dip" android:layout_marginStart="7dip" android:layout_marginEnd="7dip" @@ -67,12 +68,13 @@ android:layout_height="wrap_content" android:layout_margin="7dip" android:layout_alignParentEnd="true" - android:layout_alignParentBottom="true" + android:layout_below="@id/login" android:text="@string/kg_login_submit_button" /> </RelativeLayout> + <!-- no room for ECA on this screen right now <include layout="@layout/keyguard_emergency_carrier_area" android:id="@+id/keyguard_selector_fade_container" android:layout_width="match_parent" @@ -80,5 +82,6 @@ android:orientation="vertical" android:layout_gravity="bottom|center_horizontal" android:gravity="center_horizontal" /> + --> </com.android.internal.policy.impl.keyguard.KeyguardAccountView> |