Merge "Remove silky flag for searching and help menu" into sc-dev (ea2b64a9) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsPreferenceFragment.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import android.content.pm.PackageManager;
		import android.os.Bundle;
		import android.text.TextUtils;
		import android.util.ArrayMap;
		import android.util.FeatureFlagUtils;
		import android.util.Log;
		import android.view.LayoutInflater;
		import android.view.View;
		@@ -43,11 +42,8 @@ import androidx.preference.PreferenceScreen;
		import androidx.recyclerview.widget.LinearLayoutManager;
		import androidx.recyclerview.widget.RecyclerView;

		import com.android.settings.core.FeatureFlags;
		import com.android.settings.core.InstrumentedPreferenceFragment;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
		import com.android.settings.search.actionbar.SearchMenuController;
		import com.android.settings.support.actionbar.HelpMenuController;
		import com.android.settings.support.actionbar.HelpResourceProvider;
		import com.android.settings.widget.HighlightablePreferenceGroupAdapter;
		import com.android.settings.widget.LoadingViewController;
		@@ -129,11 +125,6 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
		@Override
		public void onCreate(Bundle icicle) {
		super.onCreate(icicle);
		// TODO(b/176883483): Remove both search and help menu if this feature rolled out
		if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
		SearchMenuController.init(this /* host */);
		HelpMenuController.init(this /* host */);
		}

		if (icicle != null) {
		mPreferenceHighlighted = icicle.getBoolean(SAVE_HIGHLIGHTED_KEY);

src/com/android/settings/applications/manageapplications/ManageApplications.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -123,7 +123,6 @@ import com.android.settings.notification.app.AppNotificationSettings;
		import com.android.settings.widget.LoadingViewController;
		import com.android.settings.wifi.AppStateChangeWifiStateBridge;
		import com.android.settings.wifi.ChangeWifiStateDetails;
		import com.android.settingslib.HelpUtils;
		import com.android.settingslib.applications.ApplicationsState;
		import com.android.settingslib.applications.ApplicationsState.AppEntry;
		import com.android.settingslib.applications.ApplicationsState.AppFilter;
		@@ -661,10 +660,6 @@ public class ManageApplications extends InstrumentedFragment
		if (activity == null) {
		return;
		}
		// 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);

src/com/android/settings/gestures/SystemNavigationGestureSettings.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -30,18 +30,14 @@ import android.content.om.OverlayInfo;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.provider.Settings;
		import android.util.FeatureFlagUtils;

		import androidx.annotation.VisibleForTesting;
		import androidx.preference.PreferenceScreen;

		import com.android.settings.R;
		import com.android.settings.core.FeatureFlags;
		import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.actionbar.SearchMenuController;
		import com.android.settings.support.actionbar.HelpMenuController;
		import com.android.settings.support.actionbar.HelpResourceProvider;
		import com.android.settings.utils.CandidateInfoExtra;
		import com.android.settings.widget.RadioButtonPickerFragment;
		@@ -76,11 +72,6 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
		@Override
		public void onAttach(Context context) {
		super.onAttach(context);
		// TODO(b/176883483): Remove both search and help menu if this feature rolled out
		if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
		SearchMenuController.init(this /* host */);
		HelpMenuController.init(this /* host */);
		}

		SuggestionFeatureProvider suggestionFeatureProvider = FeatureFactory.getFactory(context)
		.getSuggestionFeatureProvider(context);

src/com/android/settings/wifi/calling/WifiCallingSettings.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.os.Bundle;
		import android.provider.Settings;
		import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		import android.util.FeatureFlagUtils;
		import android.util.Log;
		import android.view.LayoutInflater;
		import android.view.View;
		@@ -35,12 +34,10 @@ import androidx.fragment.app.FragmentPagerAdapter;

		import com.android.internal.util.CollectionUtils;
		import com.android.settings.R;
		import com.android.settings.core.FeatureFlags;
		import com.android.settings.core.InstrumentedFragment;
		import com.android.settings.network.SubscriptionUtil;
		import com.android.settings.network.ims.WifiCallingQueryImsState;
		import com.android.settings.search.actionbar.SearchMenuController;
		import com.android.settings.support.actionbar.HelpMenuController;
		import com.android.settings.support.actionbar.HelpResourceProvider;
		import com.android.settings.widget.RtlCompatibleViewPager;
		import com.android.settings.widget.SlidingTabLayout;
		@@ -121,12 +118,6 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
		@Override
		public void onCreate(Bundle icicle) {
		super.onCreate(icicle);
		// TODO(b/176883483): Remove the option menu if collapsing toolbar feature rolled out
		if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
		setHasOptionsMenu(true);
		SearchMenuController.init(this /* host */);
		HelpMenuController.init(this /* host */);
		}

		// TODO: besides in onCreate, we should also update subList when SIM / Sub status
		// changes.