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

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

Merge "Only parse new IA category when needed."

parents 2a0c0fd4 8bfb3eac

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

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public class SettingsDrawerActivity extends Activity { 
                    // Intent explicitly set to show menu.

                    showMenuIcon();

                }

            } else if (isTopLevelTile(intent)) {

            } else if (isNavDrawerEnabled() && isTopLevelTile(intent)) {

                showMenuIcon();

            }

        }

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

+6 −4
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ public class TileUtils { 
            if (setup) {

                getTilesForAction(context, user, EXTRA_SETTINGS_ACTION, cache, null, tiles, false,

                        settingPkg);

                if (!categoryDefinedInManifest) {

                    getTilesForAction(context, user, IA_SETTINGS_ACTION, cache, null, tiles, false,

                            settingPkg);

                    if (extraAction != null) {
@@ -207,6 +208,7 @@ public class TileUtils { 
                    }

                }

            }

        }



        HashMap<String, DashboardCategory> categoryMap = new HashMap<>();

        for (Tile tile : tiles) {