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

Commit b4fc69a6 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 8f20814f: am 23d69f5c: Merge "Fix 6539117: Fix layout issues on 600dp device." into jb-dev 

* commit '8f20814f':
  Fix 6539117: Fix layout issues on 600dp device.
parents 20063319 8f20814f

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

+10 −11
Original line number Original line Diff line number Diff line
@@ -39,7 +39,16 @@ 
            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="24dip">

            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"

            <include android:id="@+id/transport"

                layout="@layout/keyguard_transport_control"

                layout="@layout/keyguard_transport_control"

                android:layout_row="0"

                android:layout_row="0"
@@ -51,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="50dip"

                android:layout_marginRight="64dip"

                android:layout_alignParentTop="true"

                android:layout_alignParentLeft="true"/>



        </RelativeLayout>

        </RelativeLayout>





    </RelativeLayout>

    </RelativeLayout>

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

+10 −13
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ 
    <!-- top: status -->

    <!-- top: status -->

    <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">
@@ -35,6 +35,14 @@ 
            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="center">

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

            <!-- Music transport control -->

            <include android:id="@+id/transport"

            <include android:id="@+id/transport"

                layout="@layout/keyguard_transport_control"

                layout="@layout/keyguard_transport_control"
@@ -47,23 +55,13 @@ 
                android:layout_height="512dip"

                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>





    </RelativeLayout>

    </RelativeLayout>





    <!-- bottom: lock pattern, emergency dialer and forgot pattern button -->

    <!-- bottom: lock pattern, emergency dialer and forgot pattern button -->

    <RelativeLayout

    <RelativeLayout

        android:layout_weight="1"

        android:layout_weight="0.60"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_height="0dip"

        android:gravity="center">

        android:gravity="center">
@@ -77,7 +75,6 @@ 
            <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"

            <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"

                android:layout_width="354dip"

                android:layout_width="354dip"

                android:layout_height="354dip"

                android:layout_height="354dip"

                android:layout_marginTop="50dip"

            />

            />





            <!-- Emergency and forgot pattern buttons. -->

            <!-- Emergency and forgot pattern buttons. -->