Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f353492 authored by Ahaan Ugale's avatar Ahaan Ugale Committed by Android (Google) Code Review
Browse files

Merge "Merge Autofill settings into Account settings." into sc-dev

parents 7cd16ae0 9b183778

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -7771,8 +7771,8 @@ 
    <string name="app_and_notification_dashboard_summary">Recent apps, default apps</string>

    <!-- Toast shown when an app in the work profile attempts to open notification settings. The apps in the work profile cannot access notification settings. [CHAR LIMIT=NONE] -->

    <string name="notification_settings_work_profile">Notification access is not available for apps in the work profile.</string>

    <!-- Title for setting tile leading to account settings [CHAR LIMIT=40]-->

    <string name="account_dashboard_title">Accounts</string>

    <!-- Title for setting tile leading to saved autofill passwords, autofill , and account settings [CHAR LIMIT=40]-->

    <string name="account_dashboard_title">Passwords and accounts</string>

    <!-- Summary for account settings tiles when there is no accounts on device [CHAR LIMIT=NONE]-->

    <string name="account_dashboard_default_summary">No accounts added</string>

    <!-- Title for setting tile leading to setting UI which allows user set default app to

res/xml/accounts_dashboard_settings.xml

+28 −4
Original line number Diff line number Diff line
@@ -21,15 +21,39 @@ 
    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="30"/>

        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="102"

        android:order="202"

        settings:allowDividerAbove="true"/>



    <SwitchPreference
@@ -37,12 +61,12 @@ 
        android:title="@string/account_settings_menu_auto_sync_work"

        android:summary="@string/auto_sync_account_summary"

        settings:forWork="true"

        android:order="103"/>

        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="104"/>

        android:order="204"/>



</PreferenceScreen>

res/xml/accounts_personal_dashboard_settings.xml

+42 −12
Original line number Diff line number Diff line
@@ -22,21 +22,51 @@ 
    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="accounts_category"

        android:order="100"

        android:title="@string/account_settings">



        <PreferenceCategory

            android:key="dashboard_tile_placeholder"

        android:order="30"/>

            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="100"

            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="110"/>

            android:order="210"/>

    </PreferenceCategory>



</PreferenceScreen>

res/xml/accounts_work_dashboard_settings.xml

+42 −12
Original line number Diff line number Diff line
@@ -22,21 +22,51 @@ 
    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" />



    <com.android.settings.widget.WorkOnlyCategory

        android:key="autofill_work_app_defaults"

        android:order="30"

        android:title="@string/default_for_work">



        <com.android.settings.widget.GearPreference

            android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"

            android:key="default_autofill_work"

            android:title="@string/autofill_app"

            settings:searchable="false">

            <extra

                android:name="for_work"

                android:value="true" />

        </com.android.settings.widget.GearPreference>

    </com.android.settings.widget.WorkOnlyCategory>



    <PreferenceCategory

        android:key="accounts_category"

        android:order="100"

        android:title="@string/account_settings">



        <PreferenceCategory

            android:key="dashboard_tile_placeholder"

        android:order="30"/>

            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="100"

            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="110"/>

            android:order="210"/>

    </PreferenceCategory>



</PreferenceScreen>

res/xml/default_autofill_picker_settings.xml

deleted100644 → 0
+0 −61
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2018 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="default_autofill_picker"

    android:title="@string/autofill_app"

    settings:keywords="@string/autofill_keywords">



  <PreferenceCategory

      android:key="passwords_category"

      android:persistent="false"

      android:title="@string/autofill_passwords"

      settings:controller="com.android.settings.applications.autofill.PasswordsPreferenceController" >

  </PreferenceCategory>



  <PreferenceCategory

      android:key="default_service_category"

      android:title="@string/autofill_app">



    <!-- TODO(b/169455298): Fix the redundant title. -->

    <com.android.settings.widget.GearPreference

        android:key="default_autofill_main"

        android:title="@string/autofill_app"

        android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"

        settings:searchable="false"

        settings:keywords="@string/autofill_keywords">

      <extra android:name="for_work" android:value="false" />

    </com.android.settings.widget.GearPreference>

  </PreferenceCategory>





  <com.android.settings.widget.WorkOnlyCategory

      android:key="autofill_work_app_defaults"

      android:title="@string/default_for_work">



    <com.android.settings.widget.GearPreference

        android:key="default_autofill_work"

        android:title="@string/autofill_app"

        android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"

        settings:searchable="false"

        settings:keywords="@string/autofill_keywords">

      <extra android:name="for_work" android:value="true" />

    </com.android.settings.widget.GearPreference>

  </com.android.settings.widget.WorkOnlyCategory>

</PreferenceScreen>