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

Commit 2f4355aa authored by Fan Zhang's avatar Fan Zhang
Browse files

Misc cleanup on AndroidManifest.xml 

- Add a few activities to widget list. These are more commonly
  used settings, so adding them to widget list for easier access.
  - Storage
  - System
  - About phone

- Remove useless intent-filters from AndroidManifest.
  - If the intent-filter is just action MAIN and category DEFAULT, it
   doesn't do anything.

Bug: 74806595
Test: visual
Change-Id: I5d80bc6c88f7bf60adabac872e92b72b341b97e6
parent 67e501c8

AndroidManifest.xml

+17 −104
Original line number Diff line number Diff line
@@ -261,10 +261,6 @@ 
                <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

                android:value="true" />

        </activity>
@@ -302,10 +298,6 @@ 
                <action android:name="android.settings.WIFI_SAVED_NETWORK_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

                android:value="com.android.settings.wifi.SavedAccessPointsWifiSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -475,6 +467,11 @@ 
                <action android:name="com.android.settings.WIFI_TETHER_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

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

            </intent-filter>

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

                android:value="com.android.settings.wifi.tether.WifiTetherSettings" />

        </activity>
@@ -616,21 +613,14 @@ 
                <action android:name="android.settings.VOICE_INPUT_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

                android:value="com.android.settings.applications.assist.ManageAssist" />

        </activity>



        <activity android:name="Settings$KeyboardLayoutPickerActivity"

            android:label="@string/keyboard_layout_picker_title"

            android:clearTaskOnLaunch="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

            android:clearTaskOnLaunch="true"

            android:exported="true">

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

                android:value="com.android.settings.inputmethod.KeyboardLayoutPickerFragment" />

        </activity>
@@ -642,10 +632,6 @@ 
                <action android:name="android.settings.HARD_KEYBOARD_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

                android:value="com.android.settings.inputmethod.PhysicalKeyboardFragment" />

        </activity>
@@ -879,10 +865,6 @@ 
                <action android:name="android.settings.ZEN_MODE_EVENT_RULE_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

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

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -984,6 +966,7 @@ 
                <action android:name="android.intent.action.MAIN" />

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

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

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

            </intent-filter>

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

                <action android:name="com.android.settings.action.SETTINGS" />
@@ -1230,17 +1213,6 @@ 
            </intent-filter>

        </activity>



        <activity android:name="Settings$BackgroundCheckSummaryActivity"

                android:label="@string/background_check_title"

                android:enabled="false">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

                android:value="com.android.settings.applications.appops.BackgroundCheckSummary" />

        </activity>



        <activity

            android:name="Settings$LocationSettingsActivity"

            android:label="@string/location_settings_title"
@@ -1317,10 +1289,6 @@ 
                <action android:name="com.android.settings.MONITORING_CERT_INFO" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

        </activity>



        <activity
@@ -1423,10 +1391,6 @@ 
                <action android:name="android.settings.USAGE_ACCESS_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

                android:value="com.android.settings.applications.manageapplications.ManageApplications" />

        </activity>
@@ -1524,10 +1488,6 @@ 
                <action android:name="android.settings.CAPTIONING_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

                android:value="com.android.settings.accessibility.CaptionPropertiesFragment" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1792,6 +1752,7 @@ 
            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

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

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

            </intent-filter>

            <intent-filter android:priority="5">
@@ -2093,10 +2054,6 @@ 
                <action android:name="android.settings.NFCSHARING_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

                android:value="com.android.settings.nfc.AndroidBeam" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2113,10 +2070,6 @@ 
                <action android:name="android.settings.CAST_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

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

            </intent-filter>
@@ -2148,10 +2101,6 @@ 
        </activity>



        <activity android:name="Settings$TestingSettingsActivity" android:label="@string/testing">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

                android:value="com.android.settings.TestingSettings" />

        </activity>
@@ -2254,10 +2203,6 @@ 
                <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

                android:value="com.android.settings.accounts.AccountSyncSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2288,10 +2233,6 @@ 
                <action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

                android:value="true" />

        </activity>
@@ -2352,10 +2293,6 @@ 
                <action android:name="android.app.action.START_ENCRYPTION" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

                android:value="com.android.settings.security.CryptKeeperSettings" />

        </activity>
@@ -2422,10 +2359,6 @@ 
                <action android:name="android.settings.USER_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

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

            </intent-filter>
@@ -2494,10 +2427,6 @@ 
                <action android:name="android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

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

        </activity>
@@ -2511,10 +2440,6 @@ 
                <action android:name="android.settings.VR_LISTENER_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

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

        </activity>
@@ -2559,10 +2484,6 @@ 
                <action android:name="android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

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

        </activity>
@@ -2651,10 +2572,6 @@ 
                <action android:name="android.settings.APP_NOTIFICATION_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

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

        </activity>
@@ -2662,10 +2579,6 @@ 
        <!-- Show channel group-level notification settings (group passed in as extras) -->

        <activity android:name="Settings$ChannelGroupNotificationSettingsActivity"

                  android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

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

        </activity>
@@ -2678,10 +2591,6 @@ 
                <action android:name="android.settings.CHANNEL_NOTIFICATION_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

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

        </activity>
@@ -2776,10 +2685,6 @@ 
                <action android:name="com.android.settings.sim.SIM_SUB_INFO_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

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

            </intent-filter>
@@ -3078,6 +2983,10 @@ 
                <action android:name="android.settings.SYNC_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

                       android:value="com.android.settings.accounts.AccountDashboardFragment"/>

            <meta-data android:name="com.android.settings.category"
@@ -3095,6 +3004,10 @@ 
            <intent-filter android:priority="-1">

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

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

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

res/xml/device_admin_settings.xml

+2 −8
Original line number Diff line number Diff line
@@ -19,11 +19,5 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/manage_device_admin"

    android:key="device_admin_settings">



    <PreferenceCategory

        android:key="device_admin_list"

        android:title="@string/summary_placeholder"

    android:key="device_admin_settings"

    settings:controller="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminListPreferenceController" />
 
 No newline at end of file
 


</PreferenceScreen>
 
 No newline at end of file

src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java

+6 −2
Original line number Diff line number Diff line
@@ -173,8 +173,12 @@ public class DeviceAdminListPreferenceController extends BasePreferenceControlle 
        final Context prefContext = mPreferenceGroup.getContext();

        final int childrenCount = mPreferenceGroup.getPreferenceCount();

        for (int i = 0; i < childrenCount; i++) {

            SwitchPreference pref = (SwitchPreference) mPreferenceGroup.getPreference(i);

            preferenceCache.put(pref.getKey(), pref);

            final Preference pref = mPreferenceGroup.getPreference(i);

            if (!(pref instanceof SwitchPreference)) {

                continue;

            }

            final SwitchPreference appSwitch = (SwitchPreference) pref;

            preferenceCache.put(appSwitch.getKey(), appSwitch);

        }

        for (DeviceAdminListItem item : mAdmins) {

            final String key = item.getKey();

src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import android.widget.CompoundButton; 
import com.android.internal.app.LocalePicker;

import com.android.internal.app.LocaleStore;

import com.android.settings.R;

import com.android.settings.shortcut.CreateShortcut;

import com.android.settings.shortcut.ShortcutsUpdateTask;



import java.text.NumberFormat;

import java.util.ArrayList;
@@ -294,7 +294,7 @@ class LocaleDragAndDropAdapter 


                LocalePicker.updateLocales(mLocalesToSetNext);

                mLocalesSetLast = mLocalesToSetNext;

                new CreateShortcut.ShortcutsUpdateTask(mContext).execute();

                new ShortcutsUpdateTask(mContext).execute();



                mLocalesToSetNext = null;

src/com/android/settings/shortcut/CreateShortcut.java

+0 −33
Original line number Diff line number Diff line
@@ -191,37 +191,4 @@ public class CreateShortcut extends LauncherActivity { 
        return new Intent(Intent.ACTION_MAIN).addCategory("com.android.settings.SHORTCUT");

    }



    public static class ShortcutsUpdateTask extends AsyncTask<Void, Void, Void> {



        private final Context mContext;



        public ShortcutsUpdateTask(Context context) {

            mContext = context;

        }



        @Override

        public Void doInBackground(Void... params) {

            ShortcutManager sm = mContext.getSystemService(ShortcutManager.class);

            PackageManager pm = mContext.getPackageManager();



            List<ShortcutInfo> updates = new ArrayList<>();

            for (ShortcutInfo info : sm.getPinnedShortcuts()) {

                if (!info.getId().startsWith(SHORTCUT_ID_PREFIX)) {

                    continue;

                }

                ComponentName cn = ComponentName.unflattenFromString(

                        info.getId().substring(SHORTCUT_ID_PREFIX.length()));

                ResolveInfo ri = pm.resolveActivity(getBaseIntent().setComponent(cn), 0);

                if (ri == null) {

                    continue;

                }

                updates.add(new ShortcutInfo.Builder(mContext, info.getId())

                        .setShortLabel(ri.loadLabel(pm)).build());

            }

            if (!updates.isEmpty()) {

                sm.updateShortcuts(updates);

            }

            return null;

        }

    }

}