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

Commit b12e197a authored by Fan Zhang's avatar Fan Zhang
Browse files

Update category key values. 

And revert changes made for TileUtils in I864e5aea because we don't need
to create a new metadata field for category

Bug: 31781480
Fix: 31780631
Test: compiles
Change-Id: Ia63c4047bfc675556a9c1c91472a68af2d455ec4
parent dc787ff9

packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java

+12 −12
Original line number Diff line number Diff line
@@ -18,17 +18,17 @@ package com.android.settingslib.drawer; 
public final class CategoryKey {



    // Activities in this category shows up in Settings homepage.

    public static final String CATEGORY_HOMEPAGE = "com.android.settings.category.homepage";

    public static final String CATEGORY_HOMEPAGE = "com.android.settings.category.ia.homepage";



    // Top level categor.

    public static final String CATEGORY_NETWORK = "com.android.settings.category.wireless";

    public static final String CATEGORY_DEVICE = "com.android.settings.category.device";

    public static final String CATEGORY_APPS = "com.android.settings.category.apps";

    public static final String CATEGORY_BATTERY = "com.android.settings.category.battery";

    public static final String CATEGORY_DISPLAY = "com.android.settings.category.display";

    public static final String CATEGORY_SOUND = "com.android.settings.category.sound";

    public static final String CATEGORY_STORAGE = "com.android.settings.category.storage";

    public static final String CATEGORY_SECURITY = "com.android.settings.category.security";

    public static final String CATEGORY_ACCOUNT = "com.android.settings.category.accounts";

    public static final String CATEGORY_SYSTEM = "com.android.settings.category.system";

    // Top level category.

    public static final String CATEGORY_NETWORK = "com.android.settings.category.ia.wireless";

    public static final String CATEGORY_DEVICE = "com.android.settings.category.ia.device";

    public static final String CATEGORY_APPS = "com.android.settings.category.ia.apps";

    public static final String CATEGORY_BATTERY = "com.android.settings.category.ia.battery";

    public static final String CATEGORY_DISPLAY = "com.android.settings.category.ia.display";

    public static final String CATEGORY_SOUND = "com.android.settings.category.ia.sound";

    public static final String CATEGORY_STORAGE = "com.android.settings.category.ia.storage";

    public static final String CATEGORY_SECURITY = "com.android.settings.category.ia.security";

    public static final String CATEGORY_ACCOUNT = "com.android.settings.category.ia.accounts";

    public static final String CATEGORY_SYSTEM = "com.android.settings.category.ia.system";

}

packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java

+7 −16
Original line number Diff line number Diff line
@@ -93,13 +93,6 @@ public class TileUtils { 
     */

    private static final String EXTRA_CATEGORY_KEY = "com.android.settings.category";



    /**

     * The key used to get the category from metadata of activities of action

     * {@link #EXTRA_SETTINGS_ACTION}

     * The value must be one of constants defined in {@code CategoryKey}.

     */

    private static final String EXTRA_IA_CATEGORY_KEY = "com.android.settings.iacategory";



    /**

     * Name of the meta-data item that should be set in the AndroidManifest.xml

     * to specify the icon that should be displayed for the preference.
@@ -240,20 +233,18 @@ public class TileUtils { 
            ActivityInfo activityInfo = resolved.activityInfo;

            Bundle metaData = activityInfo.metaData;

            String categoryKey = defaultCategory;

            if (metaData != null && categoryKey == null) {

                // categoryKey is null, try to get it from metadata.

                if (metaData.containsKey(EXTRA_IA_CATEGORY_KEY)) {

                    categoryKey = metaData.getString(EXTRA_IA_CATEGORY_KEY);

                } else if (metaData.containsKey(EXTRA_CATEGORY_KEY)) {

                    categoryKey = metaData.getString(EXTRA_CATEGORY_KEY);

                }

            }

            if (checkCategory && categoryKey == null) {



            // Load category

            if (checkCategory && ((metaData == null) || !metaData.containsKey(EXTRA_CATEGORY_KEY))

                    && categoryKey == null) {

                Log.w(LOG_TAG, "Found " + resolved.activityInfo.name + " for intent "

                        + intent + " missing metadata "

                        + (metaData == null ? "" : EXTRA_CATEGORY_KEY));

                continue;

            } else {

                categoryKey = metaData.getString(EXTRA_CATEGORY_KEY);

            }



            Pair<String, String> key = new Pair<String, String>(activityInfo.packageName,

                    activityInfo.name);

            Tile tile = addedCache.get(key);