881d579620
- Rename UserAndAccountDashboard* to AccountDashboard*
- Move emergency info from account to device info page
- Move auto sync data toggles (4 of them) from Account page to user page
- Move the controllers too. UserSettings is a not a DashboardFragment
so I had to manually call each controller method.
TODO: refactor UserSettings to a DashboardFragment
- Move legal information/regulatory info above advance button within device info page.
Fixes: 72523158
Bug: 71871075
Test: robotests
Change-Id: I1b8af8af61e49d17926f984978a09a974b6c62e1
61 lines
2.2 KiB
XML
61 lines
2.2 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2012 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.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
|
|
<PreferenceScreen
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:key="user_settings_screen"
|
|
android:title="@string/user_settings_title">
|
|
|
|
<PreferenceCategory
|
|
android:key="user_list"
|
|
android:title="@string/user_list_title"
|
|
android:order="10">
|
|
</PreferenceCategory>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="user_add"
|
|
android:title="@string/user_add_user_or_profile_menu"
|
|
android:icon="@drawable/ic_menu_add"
|
|
android:order="20"/>
|
|
|
|
<SwitchPreference
|
|
android:key="auto_sync_account_data"
|
|
android:title="@string/auto_sync_account_title"
|
|
android:summary="@string/auto_sync_account_summary"
|
|
android:order="102"
|
|
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="103"/>
|
|
|
|
<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="104"/>
|
|
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="user_settings_add_users_when_locked"
|
|
android:title="@string/user_add_on_lockscreen_menu"
|
|
android:singleLineTitle="false"
|
|
android:order="105"/>
|
|
|
|
</PreferenceScreen>
|