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

Merge "Account settings: Fix duplicate title and extra padding." into sc-dev am: 52f627f9ef

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

Change-Id: I3fcd962a89216a7abf98304d937d2e733984c608
This commit is contained in:
TreeHugger Robot
2021-05-14 04:34:12 +00:00
committed by Automerger Merge Worker
parent b151225fae 52f627f9ef
commit 5390257b90
5 changed files with 49 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
res/xml/accounts_dashboard_settings.xml
View File

@@ -46,33 +46,27 @@
</PreferenceCategory>
<PreferenceCategory
android:key="accounts_category"
android:order="100"
android:title="@string/account_settings">
android:key="dashboard_tile_placeholder"
android:order="130"/>
<PreferenceCategory
android:key="dashboard_tile_placeholder"
android:order="130"/>
<SwitchPreference
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title"
android:summary="@string/auto_sync_account_summary"
android:order="202"
settings:allowDividerAbove="true"/>
<SwitchPreference
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title"
android:summary="@string/auto_sync_account_summary"
android:order="202"
settings:allowDividerAbove="true"/>
<SwitchPreference
android:key="auto_sync_work_account_data"
android:title="@string/account_settings_menu_auto_sync_work"
android:summary="@string/auto_sync_account_summary"
settings:forWork="true"
android:order="203"/>
<SwitchPreference
android:key="auto_sync_work_account_data"
android:title="@string/account_settings_menu_auto_sync_work"
android:summary="@string/auto_sync_account_summary"
settings:forWork="true"
android:order="203"/>
<SwitchPreference
android:key="auto_sync_personal_account_data"
android:title="@string/account_settings_menu_auto_sync_personal"
android:summary="@string/auto_sync_account_summary"
android:order="204"/>
</PreferenceCategory>
<SwitchPreference
android:key="auto_sync_personal_account_data"
android:title="@string/account_settings_menu_auto_sync_personal"
android:summary="@string/auto_sync_account_summary"
android:order="204"/>
</PreferenceScreen>

32
res/xml/accounts_personal_dashboard_settings.xml
View File

@@ -47,26 +47,20 @@
</PreferenceCategory>
<PreferenceCategory
android:key="accounts_category"
android:order="100"
android:title="@string/account_settings">
android:key="dashboard_tile_placeholder"
android:order="130"/>
<PreferenceCategory
android:key="dashboard_tile_placeholder"
android:order="130"/>
<SwitchPreference
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title"
android:summary="@string/auto_sync_account_summary"
android:order="200"
settings:allowDividerAbove="true"/>
<SwitchPreference
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title"
android:summary="@string/auto_sync_account_summary"
android:order="200"
settings:allowDividerAbove="true"/>
<SwitchPreference
android:key="auto_sync_personal_account_data"
android:title="@string/account_settings_menu_auto_sync_personal"
android:summary="@string/auto_sync_account_summary"
android:order="210"/>
</PreferenceCategory>
<SwitchPreference
android:key="auto_sync_personal_account_data"
android:title="@string/account_settings_menu_auto_sync_personal"
android:summary="@string/auto_sync_account_summary"
android:order="210"/>
</PreferenceScreen>

34
res/xml/accounts_work_dashboard_settings.xml
View File

@@ -33,7 +33,7 @@
<com.android.settings.widget.WorkOnlyCategory
android:key="autofill_work_app_defaults"
android:order="30"
android:title="@string/default_for_work">
android:title="@string/autofill_app">
<com.android.settings.widget.GearPreference
android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"
@@ -47,26 +47,20 @@
</com.android.settings.widget.WorkOnlyCategory>
<PreferenceCategory
android:key="accounts_category"
android:order="100"
android:title="@string/account_settings">
android:key="dashboard_tile_placeholder"
android:order="130"/>
<PreferenceCategory
android:key="dashboard_tile_placeholder"
android:order="130"/>
<SwitchPreference
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title"
android:summary="@string/auto_sync_account_summary"
android:order="200"
settings:allowDividerAbove="true"/>
<SwitchPreference
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title"
android:summary="@string/auto_sync_account_summary"
android:order="200"
settings:allowDividerAbove="true"/>
<SwitchPreference
android:key="auto_sync_work_account_data"
android:title="@string/account_settings_menu_auto_sync_work"
android:summary="@string/auto_sync_account_summary"
android:order="210"/>
</PreferenceCategory>
<SwitchPreference
android:key="auto_sync_work_account_data"
android:title="@string/account_settings_menu_auto_sync_work"
android:summary="@string/auto_sync_account_summary"
android:order="210"/>
</PreferenceScreen>