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

Commit daa90035 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "5/ Refine SetupChooseLockPattern layout by design" into tm-qpr-dev am: 66e23eb8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20877556



Change-Id: I1c14caa62062f58fa43ed0861d8f527ddcade3d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40838101 66e23eb8

res/layout-land/choose_lock_pattern_common.xml

+13 −21
Original line number Diff line number Diff line
@@ -33,30 +33,29 @@ 
        android:clipChildren="false"

        android:clipToPadding="false"

        android:orientation="vertical"

        android:paddingTop="0dp"

        android:paddingLeft="0dp"

        android:paddingRight="0dp">

        android:paddingRight="0dp"

        android:paddingBottom="0dp">



        <TextView

            android:id="@+id/headerText"

            style="@style/SudDescription.Glif"

            android:layout_width="match_parent"

        <!-- 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:minLines="2"

            android:gravity="center"

            android:paddingStart="?attr/sudMarginStart"

            android:paddingEnd="?attr/sudMarginEnd"

            android:fontFamily="@*android:string/config_headlineFontFamily" />

            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"

            android:layout_height="0dp"

            android:layout_weight="1">

            android:layout_height="wrap_content">



            <com.android.internal.widget.LockPatternView

                android:id="@+id/lockPattern"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_width="@dimen/biometric_auth_pattern_view_size"

                android:layout_height="@dimen/biometric_auth_pattern_view_size"

                android:layout_gravity="center"/>



        </com.google.android.setupdesign.view.FillContentLayout>
@@ -69,13 +68,6 @@ 
                  android:textSize="14sp"

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

    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>



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

res/layout/choose_lock_pattern_common.xml

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

        android:paddingRight="0dp">



        <TextView

            android:id="@+id/headerText"

            style="@style/SudDescription.Glif"

            android:layout_width="match_parent"

        <Button

            android:id="@+id/screen_lock_options"

            style="@style/LockPatternButtonStyle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:minLines="2"

            android:gravity="center"

            android:paddingStart="?attr/sudMarginStart"

            android:paddingEnd="?attr/sudMarginEnd"

            android:fontFamily="@*android:string/config_headlineFontFamily" />

            android:text="@string/setup_lock_settings_options_button_label"

            android:visibility="gone"/>



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

            style="@style/LockPatternContainerStyle"
@@ -69,13 +66,6 @@ 
                  android:textSize="14sp"

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

    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>



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

res/values-land/dimens.xml

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

res/values-land/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
        <item name="android:minHeight">@dimen/biometric_auth_pattern_view_size</item>

        <item name="android:minWidth">@dimen/biometric_auth_pattern_view_size</item>

        <item name="android:gravity">center</item>

        <item name="android:layout_gravity">bottom</item>

        <item name="android:paddingBottom">0dp</item>

        <item name="android:paddingHorizontal">0dp</item>

        <item name="android:paddingTop">0dp</item>

res/values/styles.xml

+6 −0
Original line number Diff line number Diff line
@@ -449,6 +449,12 @@ 
        <item name="*android:dotColor">?android:attr/textColorSecondary</item>

    </style>



    <style name="LockPatternButtonStyle" parent="@style/SudGlifButton.Tertiary">

        <item name="android:layout_marginStart">@dimen/sud_glif_button_margin_start</item>

        <item name="android:layout_marginEnd">@dimen/sud_glif_button_margin_end</item>

        <item name="android:layout_gravity">start|top</item>

    </style>



    <style name="device_info_dialog_label">

        <item name="android:textAlignment">viewStart</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>