Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46cf90af authored by Mill Chen's avatar Mill Chen
Browse files

Remove search and help menu items from toolbar 

Based on the Settings UI guideline, both of search and help menu items
will be removed from toolbar on Android S.

Bug: 179332520
Test: visual verified
1) Settings -> System -> Gestures -> System navigation
2) Observe the toolbar and check if search and help icons are existing

Change-Id: I3d71eddffb8876f936cf56858d0604aba7d4ee4b
parent e74e93b3

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

+7 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.FeatureFlagUtils;

import android.view.accessibility.AccessibilityManager;



import androidx.annotation.VisibleForTesting;
@@ -38,6 +39,7 @@ import androidx.preference.PreferenceScreen; 


import com.android.settings.R;

import com.android.settings.SettingsTutorialDialogWrapperActivity;

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;
@@ -77,8 +79,11 @@ 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);