Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55c6e828 authored by Jim Miller's avatar Jim Miller
Browse files

Fix 6535413: Fix overlapping controls in keyguard 

It appears that rendering order changed in recent builds.  The
transport control used to work in HC and ICS.  In any case, the fix
is to swap the positions of the two widgets, which ensures the
transport control appears on top of the status area.

Change-Id: I312d0a83e7bebbdc57f037e732e371538a781e86
parent 73bde11e

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

+12 −12
Original line number Diff line number Diff line
@@ -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>

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

+12 −12
Original line number Diff line number Diff line
@@ -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

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

+9 −8
Original line number Diff line number Diff line
@@ -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>

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

+11 −11
Original line number Diff line number Diff line
@@ -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>

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

+2 −0
Original line number Diff line number Diff line
@@ -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"