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

Commit 346c1f4f authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge changes I24a9d34d,I443e9d2b into nyc-dev 

* changes:
  Add default app prefs to app info
  Rearrange configure/default apps
parents e4cf5b20 2108d361

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -2768,7 +2768,7 @@ 
            </intent-filter>

        </activity>



        <activity android:name="Settings$ManageDefaultAppsActivity"

        <activity android:name="Settings$AdvancedAppsActivity"

                  android:taskAffinity=""

                  android:exported="true">

            <intent-filter android:priority="1">
@@ -2780,7 +2780,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

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

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

        </activity>



        <service

res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -126,4 +126,8 @@ 
    <!-- Confirm device credentials screen -->

    <attr name="confirmDeviceCredentialsSideMargin" format="dimension" />

    <attr name="confirmDeviceCredentialsTopMargin" format="dimension" />



    <declare-styleable name="WorkPreference">

        <attr name="forWork" format="boolean" />

    </declare-styleable>

</resources>

res/values/strings.xml

+8 −1
Original line number Diff line number Diff line
@@ -6511,7 +6511,10 @@ 
    <string name="fingerprint_not_recognized">Not recognized</string>









    <!-- Title for Default Apps settings [CHAR LIMIT=30] -->









    <string name="default_apps_title">Default Apps</string>









    <string name="default_apps_title">Default</string>

















    <!-- Title for Default Apps settings for work [CHAR LIMIT=30] -->









    <string name="default_for_work">Default for work</string>

















    <!-- Title for Assist and voice input settings [CHAR LIMIT=30] -->









    <string name="assist_and_voice_input_title">Assist &amp; voice input</string>








@@ -7246,4 +7249,8 @@







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









    <!-- Notification log debug tool: the word 'none' -->









    <string name="notification_log_details_none">none</string>

















    <!-- [CHAR_LIMIT=60] Label for special access screen -->









    <string name="special_access">Special access</string>

















</resources>

























res/xml/advanced_apps.xml



+65
−37






























Original line number
Diff line number
Diff line







@@ -24,6 +24,9 @@







        android:title="@string/app_permissions"









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



















    <PreferenceCategory









        android:title="@string/default_apps_title">



















        <PreferenceScreen









            android:key="domain_urls"









            android:title="@string/domain_urls_title"








@@ -33,43 +36,68 @@







                android:value="com.android.settings.Settings$DomainsURLsAppListActivity" />









        </PreferenceScreen>



















    <PreferenceCategory









        android:title="@string/advanced_apps" />









        <Preference









            android:key="assist_and_voice_input"









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









            android:title="@string/assist_and_voice_input_title" />



















    <PreferenceScreen









        android:key="default_apps"









        android:fragment="com.android.settings.applications.ManageDefaultApps"









        android:title="@string/default_apps_title"









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









        <com.android.settings.applications.DefaultHomePreference









            android:key="default_home"









            android:title="@string/home_app"









            android:summary="@string/no_default_home" />



















    <PreferenceScreen









        android:key="system_alert_window"









        android:title="@string/system_alert_window_settings"









        android:fragment="com.android.settings.applications.ManageApplications"









        settings:keywords="@string/keywords_system_alert_window">









        <extra









            android:name="classname"









            android:value="com.android.settings.Settings$OverlaySettingsActivity" />









    </PreferenceScreen>









        <com.android.settings.applications.DefaultBrowserPreference









            android:key="default_browser"









            android:title="@string/default_browser_title"









            android:summary="@string/default_browser_title_none" />



















    <PreferenceScreen









        android:key="write_settings_apps"









        android:title="@string/write_settings"









        android:fragment="com.android.settings.applications.ManageApplications"









        settings:keywords="@string/keywords_write_settings">









        <extra









            android:name="classname"









            android:value="com.android.settings.Settings$WriteSettingsActivity" />









    </PreferenceScreen>









        <com.android.settings.applications.DefaultPhonePreference









            android:key="default_phone_app"









            android:title="@string/default_phone_title"









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



















        <com.android.settings.applications.DefaultEmergencyPreference









            android:key="default_emergency_app"









            android:title="@string/default_emergency_app"









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



















        <com.android.settings.applications.DefaultSmsPreference









            android:key="default_sms_app"









            android:title="@string/sms_application_title"









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



















        <com.android.settings.applications.DefaultNotificationAssistantPreference









            android:key="default_notification_asst_app"









            android:title="@string/default_notification_assistant" />





























    </PreferenceCategory>



















    <com.android.settings.WorkOnlyCategory









        android:key="work_defaults"









        android:title="@string/default_for_work">



















        <com.android.settings.applications.DefaultBrowserPreference









            android:key="work_default_browser"









            android:title="@string/default_browser_title"









            android:summary="@string/default_browser_title_none"









            settings:forWork="true" />



















        <com.android.settings.applications.DefaultPhonePreference









            android:key="work_default_phone_app"









            android:title="@string/default_phone_title"









            settings:keywords="@string/keywords_default_phone_app"









            settings:forWork="true" />



















    </com.android.settings.WorkOnlyCategory>



















    <PreferenceCategory









        android:title="@string/advanced_apps">



















        <PreferenceScreen









        android:key="high_power_apps"









        android:title="@string/high_power_apps"









        android:fragment="com.android.settings.applications.ManageApplications"









        settings:keywords="@string/keywords_ignore_optimizations">









        <extra









            android:name="classname"









            android:value="com.android.settings.Settings$HighPowerApplicationsActivity" />









    </PreferenceScreen>









            android:key="special_access"









            android:fragment="com.android.settings.applications.SpecialAccessSettings"









            android:title="@string/special_access" />



















    </PreferenceCategory>









</PreferenceScreen>
























res/xml/default_apps.xml
deleted100644 → 0



+0
−62






























Original line number
Diff line number
Diff line









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









<!-- Copyright (C) 2015 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/com.android.settings"









        android:key="default_apps">



















    <Preference









        android:key="assist_and_voice_input"









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









        android:title="@string/assist_and_voice_input_title"









        />



















    <com.android.settings.applications.DefaultHomePreference









            android:key="default_home"









            android:title="@string/home_app"









            android:summary="@string/no_default_home"









            />



















    <com.android.settings.applications.DefaultBrowserPreference









            android:key="default_browser"









            android:title="@string/default_browser_title"









            android:summary="@string/default_browser_title_none"









            />



















    <com.android.settings.applications.DefaultPhonePreference









            android:key="default_phone_app"









            android:title="@string/default_phone_title"









            settings:keywords="@string/keywords_default_phone_app"









            />



















    <com.android.settings.applications.DefaultEmergencyPreference









            android:key="default_emergency_app"









            android:title="@string/default_emergency_app"









            settings:keywords="@string/keywords_emergency_app"









            />



















    <com.android.settings.applications.DefaultSmsPreference









            android:key="default_sms_app"









            android:title="@string/sms_application_title"









            settings:keywords="@string/keywords_more_default_sms_app"









            />



















    <com.android.settings.applications.DefaultNotificationAssistantPreference









            android:key="default_notification_asst_app"









            android:title="@string/default_notification_assistant" />



















</PreferenceScreen>