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

Commit 2715e885 authored by Pasty Chang's avatar Pasty Chang Committed by Android (Google) Code Review
Browse files

Merge "Migrate attribute sudMarginSides into sudMarginStart and sudMarginEnd for settings"

parents 7f5e061b 11f78cff

res/layout-land/choose_lock_pattern.xml

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
            android:layout_width="0dip"

            android:layout_height="match_parent"

            android:layout_weight="1.0"

            android:layout_marginStart="?attr/sudMarginSides"

            android:layout_marginStart="?attr/sudMarginStart"

            android:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"

            android:clipChildren="false"

            android:clipToPadding="false"

res/layout-land/confirm_lock_password.xml

+6 −6
Original line number Diff line number Diff line
@@ -33,16 +33,16 @@ 
            style="@style/SudDescription.Glif"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginStart="?attr/sudMarginSides"

            android:layout_marginEnd="?attr/sudMarginSides" />

            android:layout_marginStart="?attr/sudMarginStart"

            android:layout_marginEnd="?attr/sudMarginEnd" />



        <Button

            android:id="@+id/forgotButton"

            style="@style/SudGlifButton.Secondary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="?attr/sudMarginSides"

            android:layout_marginEnd="?attr/sudMarginSides"

            android:layout_marginStart="?attr/sudMarginStart"

            android:layout_marginEnd="?attr/sudMarginEnd"

            android:layout_gravity="center"

            android:visibility="gone" />
@@ -75,8 +75,8 @@ 
            style="@style/SudGlifButton.Secondary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="?attr/sudMarginSides"

            android:layout_marginEnd="?attr/sudMarginSides"

            android:layout_marginStart="?attr/sudMarginStart"

            android:layout_marginEnd="?attr/sudMarginEnd"

            android:layout_marginBottom="80dp"

            android:layout_gravity="center_horizontal"

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

res/layout-land/confirm_lock_pattern.xml

+8 −8
Original line number Diff line number Diff line
@@ -58,16 +58,16 @@ 
                    style="@style/SudDescription.Glif"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="?attr/sudMarginSides"

                    android:layout_marginEnd="?attr/sudMarginSides" />

                    android:layout_marginStart="?attr/sudMarginStart"

                    android:layout_marginEnd="?attr/sudMarginEnd" />



                <Button

                    android:id="@+id/cancelButton"

                    style="@style/SetupWizardButton.Negative"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="?attr/sudMarginSides"

                    android:layout_marginEnd="?attr/sudMarginSides"

                    android:layout_marginStart="?attr/sudMarginStart"

                    android:layout_marginEnd="?attr/sudMarginEnd"

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



                <Button
@@ -75,8 +75,8 @@ 
                    style="@style/SudGlifButton.Secondary"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="?attr/sudMarginSides"

                    android:layout_marginEnd="?attr/sudMarginSides"

                    android:layout_marginStart="?attr/sudMarginStart"

                    android:layout_marginEnd="?attr/sudMarginEnd"

                    android:layout_gravity="center"

                    android:visibility="gone" />
@@ -91,8 +91,8 @@ 
                    android:id="@+id/errorText"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="?attr/sudMarginSides"

                    android:layout_marginEnd="?attr/sudMarginSides"

                    android:layout_marginStart="?attr/sudMarginStart"

                    android:layout_marginEnd="?attr/sudMarginEnd"

                    android:layout_marginBottom="24dp"

                    android:gravity="center_vertical"/>

res/layout-land/confirm_lock_pattern_normal.xml

+6 −6
Original line number Diff line number Diff line
@@ -58,16 +58,16 @@ 
                    android:id="@+id/sud_layout_description"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="?attr/sudMarginSides"

                    android:layout_marginEnd="?attr/sudMarginSides" />

                    android:layout_marginStart="?attr/sudMarginStart"

                    android:layout_marginEnd="?attr/sudMarginEnd" />



                <Button

                    android:id="@+id/cancelButton"

                    style="@style/SetupWizardButton.Negative"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="?attr/sudMarginSides"

                    android:layout_marginEnd="?attr/sudMarginSides"

                    android:layout_marginStart="?attr/sudMarginStart"

                    android:layout_marginEnd="?attr/sudMarginEnd"

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



                <Space
@@ -81,8 +81,8 @@ 
                    android:id="@+id/errorText"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="?attr/sudMarginSides"

                    android:layout_marginEnd="?attr/sudMarginSides"

                    android:layout_marginStart="?attr/sudMarginStart"

                    android:layout_marginEnd="?attr/sudMarginEnd"

                    android:layout_marginBottom="24dp"

                    android:gravity="center_vertical"/>

            </LinearLayout>

res/layout-land/fingerprint_enroll_enrolling.xml

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
                android:layout_width="0dp"

                android:layout_weight="1"

                android:layout_height="match_parent"

                android:layout_marginStart="?attr/sudMarginSides"

                android:layout_marginStart="?attr/sudMarginStart"

                android:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"

                android:clipChildren="false"

                android:clipToPadding="false"