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

Merge "Fix 6539117: Fix layout issues on 600dp device." into jb-dev

Browse Source
This commit is contained in:
Jim Miller
2012-05-22 18:07:08 -07:00
committed by Android (Google) Code Review
parent 3534e13486 3d0083b3f8
commit 23d69f5c5e
2 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml
View File

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

23
core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml
View File

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