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

Commit 6da25703 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 6110711: Fix buttons on ChooseLockPattern for landscape layout" into jb-dev

parents 904bc315 7434a5fb

res/layout-land/choose_lock_pattern.xml

+21 −22
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
    android:id="@+id/topLayout"

    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@color/black">

    android:layout_height="match_parent">



    <!-- left side: instructions and messages -->

    <LinearLayout
@@ -43,38 +42,38 @@ 
                android:layout_height="0dip"

                android:layout_weight="1.0">



            <!-- right / bottom button: confirm or ok -->

            <Button android:id="@+id/footerRightButton"

                android:layout_height="wrap_content"

                android:layout_width="140dip"

                android:layout_alignParentBottom="true"

            <!-- confirm / restart buttons -->

            <LinearLayout android:id="@+id/buttonContainer"

                style="@style/SecurityPreferenceButtonContainer"

                android:layout_centerHorizontal="true"

                android:ellipsize="marquee"

                android:singleLine="true"

                android:drawableRight="@drawable/ic_btn_next"

                android:drawablePadding="3dip"

                android:text="@string/lockpattern_confirm_button_text"/>



                android:layout_alignParentBottom="true"

                android:orientation="vertical">



                <!-- left / top button: skip, or re-try -->

                <Button android:id="@+id/footerLeftButton"

                    style="@style/SecurityPreferenceButton"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                android:layout_width="140dip"

                android:layout_above="@id/footerRightButton"

                android:layout_centerHorizontal="true"

                android:ellipsize="marquee"

                android:singleLine="true"

                    android:text="@string/lockpattern_restart_button_text"/>



                <!-- right / bottom button: confirm or ok -->

                <Button android:id="@+id/footerRightButton"

                    style="@style/SecurityPreferenceButton"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:text="@string/lockpattern_confirm_button_text"/>



            </LinearLayout>



            <!-- message above buttons -->

            <TextView android:id="@+id/footerText"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_above="@+id/footerLeftButton"

                android:layout_above="@+id/buttonContainer"

                android:layout_centerHorizontal="true"

                android:layout_marginBottom="4dip"

                android:textSize="14sp"/>



        </RelativeLayout>

    </LinearLayout>