drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix 6535413: Fix overlapping controls in keyguard" into jb-dev

Browse Source
This commit is contained in:
Jim Miller
2012-05-24 18:45:24 -07:00
committed by Android (Google) Code Review
parent 97594d6cea 55c6e82883
commit c7f82cc7fd
6 changed files with 49 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml
View File

@ -35,18 +35,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="24dip"> android:layout_marginBottom="24dip">
<!-- Music transport control underneath -->
<include android:id="@+id/transport"
layout="@layout/keyguard_transport_control"
android:layout_row="0"
android:layout_column="0"
android:layout_rowSpan="3"
android:layout_columnSpan="1"
android:layout_gravity="fill"
android:layout_width="match_parent"
android:layout_height="512dip"
/>
<!-- Status --> <!-- Status -->
<include layout="@layout/keyguard_screen_status_land" <include layout="@layout/keyguard_screen_status_land"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -58,6 +46,18 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"/> android:layout_alignParentLeft="true"/>
<!-- Music transport control -->
<include android:id="@+id/transport"
layout="@layout/keyguard_transport_control"
android:layout_row="0"
android:layout_column="0"
android:layout_rowSpan="3"
android:layout_columnSpan="1"
android:layout_gravity="fill"
android:layout_width="match_parent"
android:layout_height="512dip"
/>
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>

24
core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml
View File

@ -25,7 +25,7 @@
<!-- top: status and emergency/forgot pattern buttons --> <!-- top: status and emergency/forgot pattern buttons -->
<RelativeLayout <RelativeLayout
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1" android:layout_weight="0.40"
android:layout_width="match_parent" android:layout_width="match_parent"
android:gravity="center"> android:gravity="center">
@ -34,6 +34,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center"> android:gravity="center">
<!-- Status -->
<include layout="@layout/keyguard_screen_status_port"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="50dip"
android:layout_marginTop="50dip"
android:layout_marginRight="64dip"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"/>
<!-- Music transport control --> <!-- Music transport control -->
<include android:id="@+id/transport" <include android:id="@+id/transport"
layout="@layout/keyguard_transport_control" layout="@layout/keyguard_transport_control"
@ -46,16 +56,6 @@
android:layout_height="512dip" android:layout_height="512dip"
/> />
<include layout="@layout/keyguard_screen_status_port"
android:layout_width="match_parent"
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>
</RelativeLayout> </RelativeLayout>
@ -64,7 +64,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1" android:layout_weight="0.60"
android:gravity="center"> android:gravity="center">
<LinearLayout <LinearLayout

17
core/res/res/layout-sw600dp/keyguard_screen_tab_unlock.xml
View File

@ -40,6 +40,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center"> android:gravity="center">
<!-- Status -->
<include layout="@layout/keyguard_screen_status_port"
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 --> <!-- Music transport control -->
<include android:id="@+id/transport" <include android:id="@+id/transport"
layout="@layout/keyguard_transport_control" layout="@layout/keyguard_transport_control"
@ -52,14 +61,6 @@
android:layout_height="512dip" android:layout_height="512dip"
/> />
<include layout="@layout/keyguard_screen_status_port"
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"/>
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>

22
core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml
View File

@ -38,7 +38,17 @@
android:layout_width="512dip" android:layout_width="512dip"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<!-- Music transport control underneath --> <!-- Status -->
<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_marginRight="64dip"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"/>
<!-- Music transport control -->
<include android:id="@+id/transport" <include android:id="@+id/transport"
layout="@layout/keyguard_transport_control" layout="@layout/keyguard_transport_control"
android:layout_row="0" android:layout_row="0"
@ -50,16 +60,6 @@
android:layout_height="512dip" 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="82dip"
android:layout_marginRight="64dip"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"/>
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>

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

@ -39,6 +39,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="24dip"> android:layout_marginBottom="24dip">
<!-- Status -->
<include layout="@layout/keyguard_screen_status_land" <include layout="@layout/keyguard_screen_status_land"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -49,6 +50,7 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"/> android:layout_alignParentLeft="true"/>
<!-- Music transport control -->
<include android:id="@+id/transport" <include android:id="@+id/transport"
layout="@layout/keyguard_transport_control" layout="@layout/keyguard_transport_control"
android:layout_row="0" android:layout_row="0"

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

@ -35,11 +35,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center"> android:gravity="center">
<!-- Status -->
<include layout="@layout/keyguard_screen_status_land" <include layout="@layout/keyguard_screen_status_land"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="50dip" android:layout_marginLeft="50dip"
android:layout_marginTop="50dip" android:layout_marginTop="50dip"
android:layout_marginBottom="100dip"
android:layout_marginRight="64dip"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"/> android:layout_alignParentLeft="true"/>