From 606c74404bf3878897d0f8ddd0525fea69e6089f Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 26 Oct 2016 15:55:53 -0700 Subject: [PATCH] Hide gear icon in actionbar if new IA is enabled. - The page that gear icon opens is moved to other places in new IA. Bug: 31799948 Test: manual Change-Id: I637d725425109d364951ac1c7515cc8bcd061cc5 --- .../settings/applications/ManageApplications.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index 2329d12f6c7..23242c716d2 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -74,6 +74,7 @@ import com.android.settings.notification.AppNotificationSettings; import com.android.settings.notification.ConfigureNotificationSettings; import com.android.settings.notification.NotificationBackend; import com.android.settings.notification.NotificationBackend.AppRow; +import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.HelpUtils; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; @@ -547,8 +548,13 @@ public class ManageApplications extends InstrumentedFragment if (mOptionsMenu == null) { return; } - mOptionsMenu.findItem(R.id.advanced).setVisible( - mListType == LIST_TYPE_MAIN || mListType == LIST_TYPE_NOTIFICATION); + final Context context = getActivity(); + if (FeatureFactory.getFactory(context).getDashboardFeatureProvider(context).isEnabled()) { + mOptionsMenu.findItem(R.id.advanced).setVisible(false); + } else { + mOptionsMenu.findItem(R.id.advanced).setVisible( + mListType == LIST_TYPE_MAIN || mListType == LIST_TYPE_NOTIFICATION); + } mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(mListType == LIST_TYPE_STORAGE && mSortOrder != R.id.sort_order_alpha);