Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only parse new IA category when needed."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-06 01:00:14 +00:00
committed by Android (Google) Code Review
parent 2a0c0fd40c 8bfb3eac94
commit 0a454c39cb
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
View File

@@ -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();
}
}

10
packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java
View File

@@ -199,11 +199,13 @@ public class TileUtils {
if (setup) {
getTilesForAction(context, user, EXTRA_SETTINGS_ACTION, cache, null, tiles, false,
settingPkg);
getTilesForAction(context, user, IA_SETTINGS_ACTION, cache, null, tiles, false,
settingPkg);
if (extraAction != null) {
getTilesForAction(context, user, extraAction, cache, null, tiles, false,
if (!categoryDefinedInManifest) {
getTilesForAction(context, user, IA_SETTINGS_ACTION, cache, null, tiles, false,
settingPkg);
if (extraAction != null) {
getTilesForAction(context, user, extraAction, cache, null, tiles, false,
settingPkg);
}
}
}
}