PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate attribute sudMarginSides into sudMarginStart and sudMarginEnd for settings

Browse Source 
The attribute sudMarginSides would be removed, after it splits to sudMarginStart and sudMarginEnd.

Bug: 173747770
Bug: 173752328
Test: atest & manual test
Change-Id: If2d72aa5d6ab75a4386d3c09f5a649e20bc59b1b
This commit is contained in:
Pasty Chang
2020-12-14 09:27:53 +00:00
parent 391d1278fa
commit 11f78cff26
18 changed files with 71 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout-land/choose_lock_pattern.xml
View File

@@ -37,7 +37,7 @@
android:layout_width="0dip" android:layout_width="0dip"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1.0" 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:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"

12
res/layout-land/confirm_lock_password.xml
View File

@@ -33,16 +33,16 @@
style="@style/SudDescription.Glif" style="@style/SudDescription.Glif"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" /> android:layout_marginEnd="?attr/sudMarginEnd" />
<Button <Button
android:id="@+id/forgotButton" android:id="@+id/forgotButton"
style="@style/SudGlifButton.Secondary" style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_gravity="center" android:layout_gravity="center"
android:visibility="gone" /> android:visibility="gone" />
@@ -75,8 +75,8 @@
style="@style/SudGlifButton.Secondary" style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_marginBottom="80dp" android:layout_marginBottom="80dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/cancel" /> android:text="@string/cancel" />

16
res/layout-land/confirm_lock_pattern.xml
View File

@@ -58,16 +58,16 @@
style="@style/SudDescription.Glif" style="@style/SudDescription.Glif"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" /> android:layout_marginEnd="?attr/sudMarginEnd" />
<Button <Button
android:id="@+id/cancelButton" android:id="@+id/cancelButton"
style="@style/SetupWizardButton.Negative" style="@style/SetupWizardButton.Negative"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:text="@string/cancel" /> android:text="@string/cancel" />
<Button <Button
@@ -75,8 +75,8 @@
style="@style/SudGlifButton.Secondary" style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_gravity="center" android:layout_gravity="center"
android:visibility="gone" /> android:visibility="gone" />
@@ -91,8 +91,8 @@
android:id="@+id/errorText" android:id="@+id/errorText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"
android:gravity="center_vertical"/> android:gravity="center_vertical"/>

12
res/layout-land/confirm_lock_pattern_normal.xml
View File

@@ -58,16 +58,16 @@
android:id="@+id/sud_layout_description" android:id="@+id/sud_layout_description"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" /> android:layout_marginEnd="?attr/sudMarginEnd" />
<Button <Button
android:id="@+id/cancelButton" android:id="@+id/cancelButton"
style="@style/SetupWizardButton.Negative" style="@style/SetupWizardButton.Negative"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:text="@string/cancel" /> android:text="@string/cancel" />
<Space <Space
@@ -81,8 +81,8 @@
android:id="@+id/errorText" android:id="@+id/errorText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"
android:gravity="center_vertical"/> android:gravity="center_vertical"/>
</LinearLayout> </LinearLayout>

2
res/layout-land/fingerprint_enroll_enrolling.xml
View File

@@ -42,7 +42,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="match_parent" 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:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"

2
res/layout-land/fingerprint_enroll_find_sensor.xml
View File

@@ -34,7 +34,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="match_parent" 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:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"

8
res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
View File

@@ -33,8 +33,8 @@
style="@style/TextAppearance.SudGlifBody" style="@style/TextAppearance.SudGlifBody"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:textAlignment="center"/> android:textAlignment="center"/>
<LinearLayout <LinearLayout
@@ -63,8 +63,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:textAlignment="center" android:textAlignment="center"
android:visibility="invisible"/> android:visibility="invisible"/>

8
res/layout/adb_qrcode_scanner_fragment.xml
View File

@@ -41,8 +41,8 @@
style="@style/TextAppearance.SudGlifBody" style="@style/TextAppearance.SudGlifBody"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:textAlignment="center" android:textAlignment="center"
android:accessibilityLiveRegion="polite"/> android:accessibilityLiveRegion="polite"/>
@@ -72,8 +72,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:textAlignment="center" android:textAlignment="center"
android:visibility="invisible"/> android:visibility="invisible"/>

6
res/layout/choose_lock_pattern_common.xml
View File

@@ -74,7 +74,8 @@
style="@style/SudDescription.Glif" style="@style/SudDescription.Glif"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginEnd"
android:minLines="2" /> android:minLines="2" />
<TextView android:id="@+id/headerText" <TextView android:id="@+id/headerText"
@@ -82,7 +83,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minLines="2" android:minLines="2"
android:gravity="center" android:gravity="center"
android:paddingHorizontal="?attr/sudMarginSides" android:paddingStart="?attr/sudMarginStart"
android:paddingEnd="?attr/sudMarginEnd"
android:textSize="12sp" /> android:textSize="12sp" />
<com.google.android.setupdesign.view.FillContentLayout <com.google.android.setupdesign.view.FillContentLayout

12
res/layout/confirm_lock_password_base.xml
View File

@@ -51,16 +51,16 @@
style="@style/SudDescription.Glif" style="@style/SudDescription.Glif"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" /> android:layout_marginEnd="?attr/sudMarginEnd" />
<Button <Button
android:id="@+id/forgotButton" android:id="@+id/forgotButton"
style="@style/SudGlifButton.Secondary" style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_gravity="center" android:layout_gravity="center"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
@@ -108,8 +108,8 @@
style="@style/SudGlifButton.Secondary" style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_marginBottom="80dp" android:layout_marginBottom="80dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/cancel" /> android:text="@string/cancel" />

8
res/layout/confirm_lock_password_normal.xml
View File

@@ -32,8 +32,8 @@
style="@style/SudDescription.Glif" style="@style/SudDescription.Glif"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" /> android:layout_marginEnd="?attr/sudMarginEnd" />
<Space <Space
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -78,8 +78,8 @@
style="@style/SudGlifButton.Secondary" style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_marginBottom="80dp" android:layout_marginBottom="80dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/cancel" /> android:text="@string/cancel" />

15
res/layout/confirm_lock_pattern_base.xml
View File

@@ -52,16 +52,16 @@
style="@style/SudDescription.Glif" style="@style/SudDescription.Glif"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" /> android:layout_marginEnd="?attr/sudMarginEnd" />
<Button <Button
android:id="@+id/cancelButton" android:id="@+id/cancelButton"
style="@style/SudGlifButton.Secondary" style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_marginBottom="80dp" android:layout_marginBottom="80dp"
android:text="@string/cancel" /> android:text="@string/cancel" />
@@ -70,8 +70,8 @@
style="@style/SudGlifButton.Secondary" style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_gravity="center" android:layout_gravity="center"
android:visibility="gone" /> android:visibility="gone" />
@@ -107,7 +107,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="?attr/sudMarginSides" android:paddingStart="?attr/sudMarginStart"
android:paddingEnd="?attr/sudMarginEnd"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:gravity="center_vertical"/> android:gravity="center_vertical"/>

11
res/layout/confirm_lock_pattern_normal_base.xml
View File

@@ -51,8 +51,8 @@
android:id="@+id/sud_layout_description" android:id="@+id/sud_layout_description"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" /> android:layout_marginEnd="?attr/sudMarginEnd" />
</LinearLayout> </LinearLayout>
@@ -86,7 +86,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:gravity="center_vertical"/> android:gravity="center_vertical"/>
@@ -95,8 +96,8 @@
style="@style/SudGlifButton.Secondary" style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_marginBottom="80dp" android:layout_marginBottom="80dp"
android:text="@string/cancel" /> android:text="@string/cancel" />

4
res/layout/storage_wizard_init.xml
View File

@@ -41,7 +41,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginStart="@dimen/sud_glif_margin_sides" android:layout_marginStart="@dimen/sud_glif_margin_start"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -108,7 +108,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginStart="@dimen/sud_glif_margin_sides" android:layout_marginStart="@dimen/sud_glif_margin_start"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"

4
res/layout/wifi_dpp_add_device_fragment.xml
View File

@@ -33,8 +33,8 @@
style="@style/TextAppearance.SudGlifBody" style="@style/TextAppearance.SudGlifBody"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:textAlignment="center" android:textAlignment="center"
android:accessibilityLiveRegion="polite"/> android:accessibilityLiveRegion="polite"/>

4
res/layout/wifi_dpp_choose_saved_wifi_network_fragment.xml
View File

@@ -33,8 +33,8 @@
style="@style/TextAppearance.SudGlifBody" style="@style/TextAppearance.SudGlifBody"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:textAlignment="center" android:textAlignment="center"
android:accessibilityLiveRegion="polite"/> android:accessibilityLiveRegion="polite"/>

4
res/layout/wifi_dpp_qrcode_generator_fragment.xml
View File

@@ -33,8 +33,8 @@
style="@style/TextAppearance.SudGlifBody" style="@style/TextAppearance.SudGlifBody"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:textAlignment="center" android:textAlignment="center"
android:accessibilityLiveRegion="polite"/> android:accessibilityLiveRegion="polite"/>

8
res/layout/wifi_dpp_qrcode_scanner_fragment.xml
View File

@@ -33,8 +33,8 @@
style="@style/TextAppearance.SudGlifBody" style="@style/TextAppearance.SudGlifBody"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:textAlignment="center" android:textAlignment="center"
android:accessibilityLiveRegion="polite"/> android:accessibilityLiveRegion="polite"/>
@@ -64,8 +64,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginStart="?attr/sudMarginSides" android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginSides" android:layout_marginEnd="?attr/sudMarginEnd"
android:textAlignment="center" android:textAlignment="center"
android:visibility="invisible"/> android:visibility="invisible"/>