diff options
| author | 2012-11-08 13:08:17 -0800 | |
|---|---|---|
| committer | 2012-11-08 13:08:17 -0800 | |
| commit | 3a54aaed02a79e589892389f1004ebcf3f8325be (patch) | |
| tree | be4859373930970cb4a2dc7544a36b439c072104 | |
| parent | 318d87fb045ee6cce9e53d9bc13691b236b555c7 (diff) | |
| parent | 838195db8f69968690971977e4b615df39504465 (diff) | |
am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev
* commit '838195db8f69968690971977e4b615df39504465':
Compress lockscreen's account login fallback to fit.
| -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> |