Merge "Add Auto sync account data to account dashboard."

This commit is contained in:
Doris Ling
2016-11-01 20:09:50 +00:00
committed by Android (Google) Code Review
10 changed files with 528 additions and 98 deletions

View File

@@ -7939,4 +7939,11 @@
<!-- Configure section header [CHAR LIMIT=30] -->
<string name="configure_section_header">Configure</string>
<!-- Switch label to enable auto sync account [CHAR LIMIT=30] -->
<string name="auto_sync_account_title">Auto sync account data</string>
<!-- Switch label to enable auto sync personal account [CHAR LIMIT=30] -->
<string name="auto_sync_personal_account_title">Auto sync personal account data</string>
<!-- Switch label to enable auto sync work account [CHAR LIMIT=30] -->
<string name="auto_sync_work_account_title">Auto sync work account data</string>
</resources>

View File

@@ -32,12 +32,24 @@
android:key="account_configuration_header"
android:title="@string/configure_section_header">
<com.android.settingslib.RestrictedSwitchPreference
android:key="add_users_when_locked"
android:title="@string/user_add_on_lockscreen_menu"
android:summary="@string/user_add_on_lockscreen_menu_summary"
settings:useAdditionalSummary="true" />
</PreferenceCategory>
<SwitchPreference
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title" />
<SwitchPreference
android:key="auto_sync_work_account_data"
android:title="@string/account_settings_menu_auto_sync_work" />
<SwitchPreference
android:key="auto_sync_personal_account_data"
android:title="@string/account_settings_menu_auto_sync_personal" />
<com.android.settingslib.RestrictedSwitchPreference
android:key="add_users_when_locked"
android:title="@string/user_add_on_lockscreen_menu"
android:summary="@string/user_add_on_lockscreen_menu_summary"
settings:useAdditionalSummary="true" />
</PreferenceScreen>