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

Commit a80a7c16 authored by Raff Tsai's avatar Raff Tsai Committed by Android (Google) Code Review
Browse files

Merge "Remove summary provider"

parents 83a62a55 6db277eb

AndroidManifest.xml

+5 −18
Original line number Diff line number Diff line
@@ -2103,12 +2103,6 @@ 
                <action android:name="android.settings.CAST_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="-6"/>

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

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

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

                android:value="com.android.settings.wfd.WifiDisplaySettings" />

        </activity>
@@ -2376,6 +2370,8 @@ 
            <meta-data android:name="com.android.settings.order" android:value="-45"/>

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

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

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

                       android:value="content://com.android.settings.dashboard.SummaryProvider/user" />

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

                       android:value="com.android.settings.users.UserSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2522,14 +2518,6 @@ 
                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter>

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

            </intent-filter>

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

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

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

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

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

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

                android:value="com.android.settings.notification.ConfigureNotificationSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2895,9 +2883,8 @@ 
        </activity-alias>



        <provider

            android:name=".backup.BackupSettingsContentProvider"

            android:authorities="com.android.settings.backup.BackupSettingsContentProvider"

	    android:exported="true">

            android:name=".dashboard.SummaryProvider"

            android:authorities="com.android.settings.dashboard.SummaryProvider">

        </provider>



        <activity android:name=".backup.UserBackupSettingsActivity"
@@ -2916,7 +2903,7 @@ 
            <meta-data android:name="com.android.settings.category"

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

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

		       android:value="content://com.android.settings.backup.BackupSettingsContentProvider/summary" />

		       android:value="content://com.android.settings.dashboard.SummaryProvider/backup" />

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

        </activity>

res/xml/app_and_notification.xml

+7 −0
Original line number Diff line number Diff line
@@ -46,6 +46,13 @@ 
        android:layout="@layout/preference_category_no_label"

        android:order="-997"/>



    <Preference

        android:key="configure_notification_settings"

        android:title="@string/configure_notification_settings"

        android:order="-440"

        android:fragment="com.android.settings.notification.ConfigureNotificationSettings"

        settings:controller="com.android.settings.notification.ConfigureNotificationPreferenceController"/>



    <!-- Notifications (appears before manage_perms), default apps (appears after) -->

    <PreferenceCategory

        android:key="dashboard_tile_placeholder"

res/xml/connected_devices_advanced.xml

+17 −8
Original line number Diff line number Diff line
@@ -36,14 +36,6 @@ 
        settings:controller="com.android.settings.nfc.NfcPreferenceController"

        android:order="-7"/>



    <com.android.settingslib.RestrictedPreference

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

        android:key="android_beam_settings"

        android:title="@string/android_beam_settings_title"

        settings:controller="com.android.settings.nfc.AndroidBeamPreferenceController"

        android:icon="@drawable/ic_android"

        android:order="-6"/>



    <SwitchPreference

        android:key="nfc_secure_settings"

        android:title="@string/nfc_secure_settings_title"
@@ -52,6 +44,23 @@ 
        android:summary="@string/nfc_secure_toggle_summary"

        android:order="-7"/>



    <Preference

        android:fragment="com.android.settings.wfd.WifiDisplaySettings"

        android:key="wifi_display_settings"

        android:title="@string/wifi_display_settings_title"

        android:icon="@drawable/ic_cast_24dp"

        android:order="-6"

        settings:searchable="false"

        settings:controller="com.android.settings.wfd.WifiDisplayPreferenceController"/>



    <com.android.settingslib.RestrictedPreference

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

        android:key="android_beam_settings"

        android:title="@string/android_beam_settings_title"

        settings:controller="com.android.settings.nfc.AndroidBeamPreferenceController"

        android:icon="@drawable/ic_android"

        android:order="-5"/>



    <com.android.settingslib.RestrictedPreference

        android:key="connected_device_printing"

        android:title="@string/print_settings"

src/com/android/settings/SettingsActivity.java

+0 −5
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ import androidx.preference.PreferenceManager; 
import com.android.internal.util.ArrayUtils;

import com.android.settings.Settings.WifiSettingsActivity;

import com.android.settings.applications.manageapplications.ManageApplications;

import com.android.settings.backup.UserBackupSettingsActivity;

import com.android.settings.core.OnActivityResultListener;

import com.android.settings.core.SettingsBaseActivity;

import com.android.settings.core.SubSettingLauncher;
@@ -643,10 +642,6 @@ public class SettingsActivity extends SettingsBaseActivity 
                showDev, isAdmin)

                || somethingChanged;



        somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,

                UserBackupSettingsActivity.class.getName()), true, isAdmin)

                || somethingChanged;



        somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,

                        Settings.WifiDisplaySettingsActivity.class.getName()),

                WifiDisplaySettings.isAvailable(this), isAdmin)

src/com/android/settings/backup/BackupSettingsHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class BackupSettingsHelper { 
     * If there is only one profile, show whether the backup is on or off.

     * Otherwise, show nothing.

     */

    String getSummary() {

    public String getSummary() {

        UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);

        if (userManager.getUserProfiles().size() == 1) {

            try {