From 8bfb3eac9418708130e9b13f30719d59a045e279 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Thu, 5 Jan 2017 14:19:30 -0800
Subject: [PATCH] Only parse new IA category when needed.

Bug: 34103984
Test: RunSettingsLibRoboTests
Change-Id: I66dd023dc119e06fded9409f03fb8e12200857db
---
 .../com/android/settingslib/drawer/SettingsDrawerActivity.java |  2 +-
 .../src/com/android/settingslib/drawer/TileUtils.java          | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
index 89ed110d3246..5bbf13f68bab 100644
--- a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
@@ -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();
             }
         }
diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java
index 0cc5ab1900ba..b327be0e3225 100644
--- a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java
@@ -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);
+                    }
                 }
             }
         }
-- 
2.11.0