diff options
| author | Jim Miller <jaggies@google.com> | 2012-05-22 17:05:13 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2012-05-22 17:05:13 -0700 |
| commit | 3d0083b3f8a11b8f1101029c3439c78dda928af1 (patch) | |
| tree | 17c9cd40f5be18f58440e2b2f04dd351bcfe18da /core/res/res/layout-sw600dp | |
| parent | 2bccea2461556a525c5c65be0364b5b9404c8651 (diff) | |
| download | frameworks_base-3d0083b3f8a11b8f1101029c3439c78dda928af1.zip frameworks_base-3d0083b3f8a11b8f1101029c3439c78dda928af1.tar.gz frameworks_base-3d0083b3f8a11b8f1101029c3439c78dda928af1.tar.bz2 | |
Fix 6539117: Fix layout issues on 600dp device.
This fixes two issues:
1. The pattern view was shown too low on the device due to shared layout
with 720dp device.
2. The time was showing on top of the transport control view (music playback widget)
Change-Id: Id8a5809f96cfbda7eb55fa91b1bea826d483373a
Diffstat (limited to 'core/res/res/layout-sw600dp')
| -rw-r--r-- | core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml | 21 | ||||
| -rw-r--r-- | core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml | 23 |
2 files changed, 20 insertions, 24 deletions
diff --git a/core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml b/core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml index 68499f4..3bdc7b6 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml @@ -39,7 +39,16 @@ android:layout_height="wrap_content" android:layout_marginBottom="24dip"> - <!-- Music transport control underneath --> + <include layout="@layout/keyguard_screen_status_land" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="50dip" + android:layout_marginTop="50dip" + android:layout_marginBottom="50dip" + android:layout_marginRight="64dip" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true"/> + <include android:id="@+id/transport" layout="@layout/keyguard_transport_control" android:layout_row="0" @@ -51,16 +60,6 @@ android:layout_height="512dip" /> - <include layout="@layout/keyguard_screen_status_land" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="50dip" - android:layout_marginTop="50dip" - android:layout_marginBottom="50dip" - android:layout_marginRight="64dip" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true"/> - </RelativeLayout> </RelativeLayout> diff --git a/core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml b/core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml index 086757d..bd9de20 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml @@ -26,7 +26,7 @@ <!-- top: status --> <RelativeLayout android:layout_height="0dip" - android:layout_weight="1" + android:layout_weight="0.40" android:layout_width="match_parent" android:gravity="center"> @@ -35,6 +35,14 @@ android:layout_height="wrap_content" android:gravity="center"> + <include layout="@layout/keyguard_screen_status_land" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="50dip" + android:layout_marginTop="50dip" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true"/> + <!-- Music transport control --> <include android:id="@+id/transport" layout="@layout/keyguard_transport_control" @@ -47,23 +55,13 @@ android:layout_height="512dip" /> - <include layout="@layout/keyguard_screen_status_land" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="50dip" - android:layout_marginTop="50dip" - android:layout_marginBottom="100dip" - android:layout_marginRight="64dip" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true"/> - </RelativeLayout> </RelativeLayout> <!-- bottom: lock pattern, emergency dialer and forgot pattern button --> <RelativeLayout - android:layout_weight="1" + android:layout_weight="0.60" android:layout_width="match_parent" android:layout_height="0dip" android:gravity="center"> @@ -77,7 +75,6 @@ <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" android:layout_width="354dip" android:layout_height="354dip" - android:layout_marginTop="50dip" /> <!-- Emergency and forgot pattern buttons. --> |