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

Commit 0aa0d665 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "role-replace" into qt-dev 

* changes:
  Remove old default apps code and use roles instead.
  Move default payment app to special app access.
parents c11f7927 22f8d48d

AndroidManifest.xml

+0 −24
Original line number Diff line number Diff line
@@ -2819,30 +2819,6 @@ 
            </intent-filter>

        </activity>



        <activity

            android:name="Settings$AdvancedAppsActivity"

            android:exported="true"

            android:label="@string/app_default_dashboard_title"

            android:parentActivityName="Settings">

            <intent-filter android:priority="1">

                <action android:name="android.settings.MANAGE_DEFAULT_APPS_SETTINGS" />

                <action android:name="android.settings.HOME_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

            <meta-data android:name="com.android.settings.order" android:value="-120"/>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.apps"/>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.applications.DefaultAppSettings" />

            <meta-data android:name="com.android.settings.summary"

                       android:resource="@string/summary_empty"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity>



        <!-- Keep compatibility with old WebView-picker implementation -->

        <activity-alias android:name=".WebViewImplementation"

                  android:targetActivity="Settings$WebViewAppPickerActivity"

res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -320,9 +320,6 @@ 
    <!-- Whether wallpaper attribution should be shown or not. -->

    <bool name="config_show_wallpaper_attribution">true</bool>



    <!-- Whether default_home should be shown or not. -->

    <bool name="config_show_default_home">true</bool>



    <!-- Whether assist_and_voice_input should be shown or not. -->

    <bool name="config_show_assist_and_voice_input">true</bool>

res/values/strings.xml

+0 −10
Original line number Diff line number Diff line
@@ -7160,10 +7160,8 @@ 
    <!-- Search keyword for "Flashlight" settings [CHAR_LIMIT=NONE]-->

    <string name="keywords_flashlight">Flashlight, Light, Torch</string>

    <string name="keywords_change_wifi_state">wifi, wi-fi, toggle, control</string>

    <string name="keywords_more_default_sms_app">text message, texting, messages, messaging, default</string>

    <string name="keywords_more_mobile_networks">cellular, mobile, cell carrier, wireless, data, 4g,3g, 2g, lte</string>

    <string name="keywords_wifi_calling">wifi, wi-fi, call, calling</string>

    <string name="keywords_home">launcher, default, apps</string>

    <string name="keywords_display">screen, touchscreen</string>

    <string name="keywords_display_brightness_level">dim screen, touchscreen, battery, bright</string>

    <string name="keywords_display_night_display">dim screen, night, tint, night shift, brightness, screen color, colour, color</string>
@@ -7188,8 +7186,6 @@ 
    <string name="keywords_users">restriction, restrict, restricted</string>

    <string name="keywords_keyboard_and_ime">text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international</string>

    <string name="keywords_reset_apps">reset, preferences, default</string>

    <string name="keywords_emergency_app">emergency, ice, app, default</string>

    <string name="keywords_default_phone_app">phone, dialer, default</string>

    <string name="keywords_all_apps">apps, download, applications, system</string>

    <string name="keywords_app_permissions">apps, permissions, security</string>

    <string name="keywords_default_apps">apps, default</string>
@@ -7261,15 +7257,9 @@ 
    <!-- List of synonyms for the Default Assist and Voice input setting, used to match in settings search [CHAR LIMIT=NONE] -->

    <string name="keywords_assist_input">default, assistant</string>













    <!-- List of synonyms for the Wallpaper picker setting, used to match in settings search [CHAR LIMIT=NONE] -->













    <string name="keywords_default_browser">default, default browser</string>



























    <!-- List of synonyms for the default payment app setting, used to match in settings search [CHAR LIMIT=NONE] -->















    <string name="keywords_default_payment_app">payment, default</string>



























    <!-- List of synonyms for the default links setting, used to match in settings search [CHAR LIMIT=NONE] -->













    <string name="keywords_default_links">default</string>



























    <!-- List of synonyms for Ambient display setting (when the screen is off), used to match in settings search [CHAR LIMIT=NONE] -->















    <string name="keywords_ambient_display">incoming notification</string>







































res/xml/app_and_notification.xml



+8
−0




























Original line number
Diff line number
Diff line








@@ -50,6 +50,14 @@













        android:key="dashboard_tile_placeholder"















        android:order="10"/>





























    <Preference













        android:key="default_apps"













        android:title="@string/app_default_dashboard_title"













        android:order="11"













        settings:controller="com.android.settings.applications.DefaultAppsPreferenceController">













        <intent android:action="android.settings.MANAGE_DEFAULT_APPS_SETTINGS"/>













    </Preference>





























    <Preference















        android:key="manage_perms"















        android:title="@string/app_permissions"

































res/xml/app_default_settings.xml
deleted100644 → 0



+0
−113




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>













<!--













  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.













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













    android:title="@string/app_default_dashboard_title"













    settings:keywords="@string/keywords_app_default">



























    <com.android.settingslib.widget.apppreference.AppPreference













        android:key="assist_and_voice_input"













        android:title="@string/assist_and_voice_input_title"













        android:fragment="com.android.settings.applications.assist.ManageAssist"













        settings:searchable="false"/>



























    <com.android.settingslib.widget.apppreference.AppPreference













        android:key="default_browser"













        android:title="@string/default_browser_title"













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













        settings:keywords="@string/keywords_default_browser">













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













    </com.android.settingslib.widget.apppreference.AppPreference>



























    <com.android.settingslib.widget.apppreference.AppPreference













        android:key="default_home"













        android:title="@string/home_app"













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













        settings:keywords="@string/keywords_home" />



























    <com.android.settingslib.widget.apppreference.AppPreference













        android:key="default_phone_app"













        android:title="@string/default_phone_title"













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













        settings:keywords="@string/keywords_default_phone_app" />



























    <com.android.settingslib.widget.apppreference.AppPreference













        android:key="default_sms_app"













        android:title="@string/sms_application_title"













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













        settings:keywords="@string/keywords_more_default_sms_app" />



























    <com.android.settingslib.widget.apppreference.AppPreference













        android:key="default_payment_app"













        android:title="@string/nfc_payment_settings_title"













        android:summary="@string/summary_placeholder"













        android:fragment="com.android.settings.nfc.PaymentSettings"













        settings:keywords="@string/keywords_default_payment_app"/>



























    <com.android.settingslib.widget.apppreference.AppPreference













        android:key="default_emergency_app"













        android:title="@string/default_emergency_app"













        settings:keywords="@string/keywords_emergency_app" />



























    <!--













    <com.android.settingslib.widget.apppreference.AppPreference













        android:key="default_notification_asst_app"













        android:title="@string/default_notification_assistant"













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













        />













     -->



























    <com.android.settingslib.widget.apppreference.AppPreference













        android:key="domain_urls"













        android:title="@string/domain_urls_title"













        android:fragment="com.android.settings.applications.managedomainurls.ManageDomainUrls"













        settings:keywords="@string/keywords_default_links"/>



























    <!--













     ~ STOPSHIP(b/110557011): Remove once the new UI is ready.













     -->













    <Preference













        android:key="roles"













        android:title="@string/roles_title"













        settings:controller="com.android.settings.applications.defaultapps.RolesPreferenceController" />



























    <com.android.settings.widget.WorkOnlyCategory













        android:key="work_app_defaults"













        android:title="@string/default_for_work">



























        <com.android.settingslib.widget.apppreference.AppPreference













            android:key="work_default_browser"













            android:title="@string/default_browser_title"













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













            settings:searchable="false">













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













        </com.android.settingslib.widget.apppreference.AppPreference>



























        <com.android.settingslib.widget.apppreference.AppPreference













            android:key="work_default_phone_app"













            android:title="@string/default_phone_title"













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













            settings:searchable="false">













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













        </com.android.settingslib.widget.apppreference.AppPreference>



























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



























</PreferenceScreen>