Merge "Add account preference controller."

This commit is contained in:
TreeHugger Robot
2016-11-18 02:13:43 +00:00
committed by Android (Google) Code Review
12 changed files with 1174 additions and 635 deletions

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project
<!-- Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,40 +16,40 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:key="account"
android:title="@string/account_settings_title"
settings:keywords="@string/keywords_accounts">
<PreferenceCategory
android:key="account_for_header"
android:title="@string/account_for_section_header" />
<Preference
android:key="emergency_info"
android:title="@string/emergency_info_title" />
android:key="emergency_info"
android:title="@string/emergency_info_title"
android:order="100"/>
<PreferenceCategory
android:key="account_configuration_header"
android:title="@string/configure_section_header">
android:key="account_configuration_header"
android:title="@string/configure_section_header"
android:order="101">
</PreferenceCategory>
<SwitchPreference
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title" />
android:key="auto_sync_account_data"
android:title="@string/auto_sync_account_title"
android:order="102" />
<SwitchPreference
android:key="auto_sync_work_account_data"
android:title="@string/account_settings_menu_auto_sync_work" />
android:key="auto_sync_work_account_data"
android:title="@string/account_settings_menu_auto_sync_work"
android:order="103"/>
<SwitchPreference
android:key="auto_sync_personal_account_data"
android:title="@string/account_settings_menu_auto_sync_personal" />
android:key="auto_sync_personal_account_data"
android:title="@string/account_settings_menu_auto_sync_personal"
android:order="104"/>
<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" />
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"
android:order="105"/>
</PreferenceScreen>