Skip to content

Commit c7f82cc

Browse files
Jim MillerAndroid (Google) Code Review
Jim Miller
authored and
Android (Google) Code Review
committed
Merge "Fix 6535413: Fix overlapping controls in keyguard" into jb-dev
2 parents 97594d6 + 55c6e82 commit c7f82cc

File tree

6 files changed

+49
-43
lines changed

6 files changed

+49
-43
lines changed

‎core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,6 @@
3535
android:layout_height="wrap_content"
3636
android:layout_marginBottom="24dip">
3737

38-
<!-- Music transport control underneath -->
39-
<include android:id="@+id/transport"
40-
layout="@layout/keyguard_transport_control"
41-
android:layout_row="0"
42-
android:layout_column="0"
43-
android:layout_rowSpan="3"
44-
android:layout_columnSpan="1"
45-
android:layout_gravity="fill"
46-
android:layout_width="match_parent"
47-
android:layout_height="512dip"
48-
/>
49-
5038
<!-- Status -->
5139
<include layout="@layout/keyguard_screen_status_land"
5240
android:layout_width="match_parent"
@@ -58,6 +46,18 @@
5846
android:layout_alignParentTop="true"
5947
android:layout_alignParentLeft="true"/>
6048

49+
<!-- Music transport control -->
50+
<include android:id="@+id/transport"
51+
layout="@layout/keyguard_transport_control"
52+
android:layout_row="0"
53+
android:layout_column="0"
54+
android:layout_rowSpan="3"
55+
android:layout_columnSpan="1"
56+
android:layout_gravity="fill"
57+
android:layout_width="match_parent"
58+
android:layout_height="512dip"
59+
/>
60+
6161
</RelativeLayout>
6262

6363
</RelativeLayout>

‎core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<!-- top: status and emergency/forgot pattern buttons -->
2626
<RelativeLayout
2727
android:layout_height="0dip"
28-
android:layout_weight="1"
28+
android:layout_weight="0.40"
2929
android:layout_width="match_parent"
3030
android:gravity="center">
3131

@@ -34,6 +34,16 @@
3434
android:layout_height="wrap_content"
3535
android:gravity="center">
3636

37+
<!-- Status -->
38+
<include layout="@layout/keyguard_screen_status_port"
39+
android:layout_width="match_parent"
40+
android:layout_height="wrap_content"
41+
android:layout_marginLeft="50dip"
42+
android:layout_marginTop="50dip"
43+
android:layout_marginRight="64dip"
44+
android:layout_alignParentTop="true"
45+
android:layout_alignParentLeft="true"/>
46+
3747
<!-- Music transport control -->
3848
<include android:id="@+id/transport"
3949
layout="@layout/keyguard_transport_control"
@@ -46,16 +56,6 @@
4656
android:layout_height="512dip"
4757
/>
4858

49-
<include layout="@layout/keyguard_screen_status_port"
50-
android:layout_width="match_parent"
51-
android:layout_height="wrap_content"
52-
android:layout_marginLeft="50dip"
53-
android:layout_marginTop="50dip"
54-
android:layout_marginBottom="100dip"
55-
android:layout_marginRight="64dip"
56-
android:layout_alignParentTop="true"
57-
android:layout_alignParentLeft="true"/>
58-
5959
</RelativeLayout>
6060

6161
</RelativeLayout>
@@ -64,7 +64,7 @@
6464
<RelativeLayout
6565
android:layout_width="match_parent"
6666
android:layout_height="0dip"
67-
android:layout_weight="1"
67+
android:layout_weight="0.60"
6868
android:gravity="center">
6969

7070
<LinearLayout

‎core/res/res/layout-sw600dp/keyguard_screen_tab_unlock.xml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,15 @@
4040
android:layout_height="wrap_content"
4141
android:gravity="center">
4242

43+
<!-- Status -->
44+
<include layout="@layout/keyguard_screen_status_port"
45+
android:layout_width="wrap_content"
46+
android:layout_height="wrap_content"
47+
android:layout_marginLeft="50dip"
48+
android:layout_marginTop="50dip"
49+
android:layout_alignParentTop="true"
50+
android:layout_alignParentLeft="true"/>
51+
4352
<!-- Music transport control -->
4453
<include android:id="@+id/transport"
4554
layout="@layout/keyguard_transport_control"
@@ -52,14 +61,6 @@
5261
android:layout_height="512dip"
5362
/>
5463

55-
<include layout="@layout/keyguard_screen_status_port"
56-
android:layout_width="wrap_content"
57-
android:layout_height="wrap_content"
58-
android:layout_marginLeft="50dip"
59-
android:layout_marginTop="50dip"
60-
android:layout_alignParentTop="true"
61-
android:layout_alignParentLeft="true"/>
62-
6364
</RelativeLayout>
6465

6566
</RelativeLayout>

‎core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,17 @@
3838
android:layout_width="512dip"
3939
android:layout_height="wrap_content">
4040

41-
<!-- Music transport control underneath -->
41+
<!-- Status -->
42+
<include layout="@layout/keyguard_screen_status_land"
43+
android:layout_width="match_parent"
44+
android:layout_height="wrap_content"
45+
android:layout_marginLeft="50dip"
46+
android:layout_marginTop="50dip"
47+
android:layout_marginRight="64dip"
48+
android:layout_alignParentTop="true"
49+
android:layout_alignParentLeft="true"/>
50+
51+
<!-- Music transport control -->
4252
<include android:id="@+id/transport"
4353
layout="@layout/keyguard_transport_control"
4454
android:layout_row="0"
@@ -50,16 +60,6 @@
5060
android:layout_height="512dip"
5161
/>
5262

53-
<include layout="@layout/keyguard_screen_status_land"
54-
android:layout_width="match_parent"
55-
android:layout_height="wrap_content"
56-
android:layout_marginLeft="50dip"
57-
android:layout_marginTop="50dip"
58-
android:layout_marginBottom="82dip"
59-
android:layout_marginRight="64dip"
60-
android:layout_alignParentTop="true"
61-
android:layout_alignParentLeft="true"/>
62-
6363
</RelativeLayout>
6464

6565
</RelativeLayout>

‎core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
android:layout_height="wrap_content"
4040
android:layout_marginBottom="24dip">
4141

42+
<!-- Status -->
4243
<include layout="@layout/keyguard_screen_status_land"
4344
android:layout_width="match_parent"
4445
android:layout_height="wrap_content"
@@ -49,6 +50,7 @@
4950
android:layout_alignParentTop="true"
5051
android:layout_alignParentLeft="true"/>
5152

53+
<!-- Music transport control -->
5254
<include android:id="@+id/transport"
5355
layout="@layout/keyguard_transport_control"
5456
android:layout_row="0"

‎core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,14 @@
3535
android:layout_height="wrap_content"
3636
android:gravity="center">
3737

38+
<!-- Status -->
3839
<include layout="@layout/keyguard_screen_status_land"
3940
android:layout_width="wrap_content"
4041
android:layout_height="wrap_content"
4142
android:layout_marginLeft="50dip"
4243
android:layout_marginTop="50dip"
44+
android:layout_marginBottom="100dip"
45+
android:layout_marginRight="64dip"
4346
android:layout_alignParentTop="true"
4447
android:layout_alignParentLeft="true"/>
4548

0 commit comments

Comments
 (0)