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

Commit 8bfb3eac authored by Fan Zhang's avatar Fan Zhang
Browse files

Only parse new IA category when needed. 

Bug: 34103984
Test: RunSettingsLibRoboTests
Change-Id: I66dd023dc119e06fded9409f03fb8e12200857db
parent 16bb6dcd

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

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,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) {