6663bed71c
This change reverts the change in I3981ce73fef63f06a40e61e894481d24284614ba to add a PreferenceCategory for the accounts after merging the page with autofill settings. That was done to get the Accounts heading to display for the personal/work profile view. This change instead sets the title on the existing PreferenceCategory that's created dynamically in the Controller. Removing the extra PreferenceCategory also fixes the padding. Fix: 183677515 Bug: 183677706 Test: manual - with single profile, with personal/work profiles Test: make -j RunSettingsRoboTests \ ROBOTEST_FILTER="com.android.settings.accounts.AccountPreferenceControllerTest" Change-Id: Ib7fe6f97b93b81d5a5897280cdd6bbad1b75f3a9
67 lines
2.5 KiB
XML
67 lines
2.5 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
Copyright (C) 2019 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_and_account_settings_screen"
|
|
android:title="@string/account_dashboard_title"
|
|
settings:keywords="@string/keywords_accounts">
|
|
|
|
<PreferenceCategory
|
|
android:key="passwords_category"
|
|
android:order="10"
|
|
android:persistent="false"
|
|
android:title="@string/autofill_passwords"
|
|
settings:controller="com.android.settings.applications.autofill.PasswordsPreferenceController"
|
|
settings:keywords="@string/autofill_keywords" />
|
|
|
|
<PreferenceCategory
|
|
android:key="default_service_category"
|
|
android:order="20"
|
|
android:title="@string/autofill_app">
|
|
|
|
<com.android.settings.widget.GearPreference
|
|
android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"
|
|
android:key="default_autofill_main"
|
|
android:title="@string/autofill_app"
|
|
settings:keywords="@string/autofill_keywords">
|
|
<extra
|
|
android:name="for_work"
|
|
android:value="false" />
|
|
</com.android.settings.widget.GearPreference>
|
|
</PreferenceCategory>
|
|
|
|
<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_personal_account_data"
|
|
android:title="@string/account_settings_menu_auto_sync_personal"
|
|
android:summary="@string/auto_sync_account_summary"
|
|
android:order="210"/>
|
|
|
|
</PreferenceScreen>
|