From 3d7a3189a753fd6d6519b5970557c772c1684f4b Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Fri, 15 Jan 2021 13:28:59 +0800 Subject: [PATCH] Remove help icon from the toolbar of App info page On Android S, the help menu will be removed from the toolbar in all setting pages. This is using a feature flag to turn on/off the help menu. Then, it should be entirely removed when the collapsing toolbar feature rolled out. Bug: 177274632 Test: visual verified Change-Id: I5aceb9f0a99ecee948272ee584bbebdcce7b7943 --- .../manageapplications/ManageApplications.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java index d41864e2683..bca622fb0fd 100644 --- a/src/com/android/settings/applications/manageapplications/ManageApplications.java +++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java @@ -55,6 +55,7 @@ import android.os.UserManager; import android.preference.PreferenceFrameLayout; import android.text.TextUtils; import android.util.ArraySet; +import android.util.FeatureFlagUtils; import android.util.IconDrawableFactory; import android.util.Log; import android.view.LayoutInflater; @@ -108,6 +109,7 @@ import com.android.settings.applications.appinfo.DrawOverlayDetails; import com.android.settings.applications.appinfo.ExternalSourcesDetails; import com.android.settings.applications.appinfo.ManageExternalStorageDetails; import com.android.settings.applications.appinfo.WriteSettingsDetails; +import com.android.settings.core.FeatureFlags; import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.profileselector.ProfileSelectFragment; @@ -681,7 +683,10 @@ public class ManageApplications extends InstrumentedFragment if (activity == null) { return; } - HelpUtils.prepareHelpMenuItem(activity, menu, getHelpResource(), getClass().getName()); + // TODO(b/176883483): Remove the help menu if this feature rolled out + if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) { + HelpUtils.prepareHelpMenuItem(activity, menu, getHelpResource(), getClass().getName()); + } mOptionsMenu = menu; inflater.inflate(R.menu.manage_apps, menu);