diff options
6 files changed, 49 insertions, 43 deletions
diff --git a/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml b/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml index ff65c61..8d5d404 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml @@ -35,18 +35,6 @@ android:layout_height="wrap_content" 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 --> <include layout="@layout/keyguard_screen_status_land" android:layout_width="match_parent" @@ -58,6 +46,18 @@ android:layout_alignParentTop="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> diff --git a/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml b/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml index 60401c9..95c15e5 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml @@ -25,7 +25,7 @@ <!-- top: status and emergency/forgot pattern buttons --> <RelativeLayout android:layout_height="0dip" - android:layout_weight="1" + android:layout_weight="0.40" android:layout_width="match_parent" android:gravity="center"> @@ -34,6 +34,16 @@ android:layout_height="wrap_content" 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 --> <include android:id="@+id/transport" layout="@layout/keyguard_transport_control" @@ -46,16 +56,6 @@ 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> @@ -64,7 +64,7 @@ <RelativeLayout android:layout_width="match_parent" android:layout_height="0dip" - android:layout_weight="1" + android:layout_weight="0.60" android:gravity="center"> <LinearLayout diff --git a/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock.xml b/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock.xml index e6829a9..a666077 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock.xml @@ -40,6 +40,15 @@ android:layout_height="wrap_content" 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 --> <include android:id="@+id/transport" layout="@layout/keyguard_transport_control" @@ -52,14 +61,6 @@ 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> diff --git a/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml b/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml index de64a51..17a3c84 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml @@ -38,7 +38,17 @@ android:layout_width="512dip" 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" layout="@layout/keyguard_transport_control" android:layout_row="0" @@ -50,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="82dip" - 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_landscape.xml b/core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml index 3bdc7b6..0153a2e 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml @@ -39,6 +39,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="24dip"> + <!-- Status --> <include layout="@layout/keyguard_screen_status_land" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -49,6 +50,7 @@ android:layout_alignParentTop="true" android:layout_alignParentLeft="true"/> + <!-- Music transport control --> <include android:id="@+id/transport" layout="@layout/keyguard_transport_control" android:layout_row="0" 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 bd9de20..78a01dd 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml @@ -35,11 +35,14 @@ android:layout_height="wrap_content" android:gravity="center"> + <!-- Status --> <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"/> |