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

Commit c0f0b0ca authored by Jason Chang's avatar Jason Chang
Browse files

Fix the “screen lock option” and password restriction view are 

in the wrong position on PIN/Password/Pattern in the landscape mode.

1. Move the description position under the GlifLayout header
2. Move the position "Screen lock options" button under the
GlifLayout header

Bug: 272676038
Bug: 285271342

Test: manully test with reproducible steps:
STEPS TO REPRODUCE:
1. Go through the setup flow
2. Continue steps until “set pin” page
3. The “screen lock option” is in the wrong position

Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings
.password.SetupChooseLockPasswordTest"

Change-Id: I24464e6b7e93f20abbeb59426919ed7fec5c7cbb
parent cc1fe613

res/layout-land/choose_lock_pattern_common.xml

+0 −9
Original line number Diff line number Diff line
@@ -38,15 +38,6 @@ 
        android:paddingRight="0dp"

        android:paddingBottom="0dp">



        <!-- TODO b/249974175 Move into Glif header mixin -->

        <Button

            android:id="@+id/screen_lock_options"

            style="@style/SudGlifButton.Tertiary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/setup_lock_settings_options_button_label"

            android:visibility="gone"/>



        <com.google.android.setupdesign.view.FillContentLayout

            style="@style/LockPatternContainerStyle"

            android:layout_width="wrap_content"

res/layout/choose_lock_password.xml

+0 −14
Original line number Diff line number Diff line
@@ -61,12 +61,6 @@ 
                android:imeOptions="actionNext|flagNoExtractUi|flagForceAscii"

                style="@style/TextAppearance.PasswordEntry"/>



            <androidx.recyclerview.widget.RecyclerView

                android:layout_marginTop="8dp"

                android:id="@+id/password_requirements_view"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"/>



            <CheckBox

                android:id="@+id/auto_pin_confirm_enabler"

                android:layout_marginTop="8dp"
@@ -91,14 +85,6 @@ 
            android:textSize="16sp"

            android:visibility="gone" />



        <Button

            android:id="@+id/screen_lock_options"

            style="@style/SudGlifButton.Tertiary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/setup_lock_settings_options_button_label"

            android:visibility="gone" />



    </LinearLayout>



</com.google.android.setupdesign.GlifLayout>

res/layout/choose_lock_pattern_common.xml

+0 −8
Original line number Diff line number Diff line
@@ -36,14 +36,6 @@ 
        android:paddingLeft="0dp"

        android:paddingRight="0dp">



        <Button

            android:id="@+id/screen_lock_options"

            style="@style/LockPatternButtonStyle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/setup_lock_settings_options_button_label"

            android:visibility="gone"/>



        <com.google.android.setupdesign.view.FillContentLayout

            style="@style/LockPatternContainerStyle"

            android:layout_width="wrap_content"

res/values/dimens.xml

+9 −0
Original line number Diff line number Diff line
@@ -229,6 +229,15 @@ 
    <!-- Minimum height for setting a lock pattern -->

    <dimen name="choose_lockscreen_min_height">200dp</dimen>



    <!-- Choose lock Password requirement dimensions -->

    <dimen name="password_requirement_view_margin_top">16dp</dimen>



    <!-- Screen lock option button dimensions -->

    <dimen name="screen_lock_options_button_margin_top">32dp</dimen>



    <!-- Choose lock Password requirement font size -->

    <dimen name="password_requirement_font_size">16sp</dimen>



    <!-- Select dialog -->

    <dimen name="select_dialog_padding_start">20dp</dimen>

    <dimen name="select_dialog_item_margin_start">12dp</dimen>

res/values/ids.xml

+4 −0
Original line number Diff line number Diff line
@@ -40,4 +40,8 @@ 


    <!-- For a layout container to add AppLocaleDetails into -->

    <item type="id" name="layout_app_locale_details" />



    <!-- For screen lock options button -->

    <item type="id" name="screen_lock_options" />



</resources>