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

Commit 1a0e2b1b authored by jasonwshsu's avatar jasonwshsu Committed by Jason Hsu
Browse files

Remove the accessibility gesture tutorial dialog in system navigation 

Accessibility gesture is replaced by the accessibility floating menu, remove the accessibility gesture tutorial dialog when choosing to use gesture navigation mode.

Bug: 173990914
Test: manual test
Change-Id: Iae5297747594fcc73fc9bc14537c8fdecb86b660
parent 5fe2cdcf

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

+1 −21
Original line number Diff line number Diff line
@@ -30,15 +30,12 @@ import android.content.om.OverlayInfo; 
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;

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;
@@ -188,12 +185,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i 
    protected boolean setDefaultKey(String key) {

        setCurrentSystemNavigationMode(mOverlayManager, key);

        setIllustrationVideo(mVideoPreference, key);

        if (TextUtils.equals(KEY_SYSTEM_NAV_GESTURAL, key) && (

                isAnyServiceSupportAccessibilityButton() || isNavBarMagnificationEnabled())) {

            Intent intent = new Intent(getActivity(), SettingsTutorialDialogWrapperActivity.class);

            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            startActivity(intent);

        }



        return true;

    }
@@ -267,18 +259,6 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i 
        }

    }



    private boolean isAnyServiceSupportAccessibilityButton() {

        final AccessibilityManager ams = getContext().getSystemService(AccessibilityManager.class);

        final List<String> targets = ams.getAccessibilityShortcutTargets(

                AccessibilityManager.ACCESSIBILITY_BUTTON);

        return !targets.isEmpty();

    }



    private boolean isNavBarMagnificationEnabled() {

        return Settings.Secure.getInt(getContext().getContentResolver(),

                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, 0) == 1;

    }



    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider(R.xml.system_navigation_gesture_settings) {