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

Commit 750dc4a0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add back the accessibility gesture tutorial dialog in system navigation" into sc-v2-dev

parents 05b2d6f5 6a2fe65a

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

+30 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.gestures;



import static android.os.UserHandle.USER_CURRENT;

import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;

import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY;

import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;

import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;
@@ -30,11 +31,14 @@ import android.content.om.OverlayInfo; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.provider.Settings;

import android.text.TextUtils;

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.dashboard.suggestions.SuggestionFeatureProvider;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.BaseSearchIndexProvider;
@@ -173,7 +177,14 @@ 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)

                && !isAccessibilityFloatingMenuEnabled()

                && (isAnyServiceSupportAccessibilityButton() || isNavBarMagnificationEnabled())) {

            final Intent intent = new Intent(getActivity(),

                    SettingsTutorialDialogWrapperActivity.class);

            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            startActivity(intent);

        }

        return true;

    }
@@ -246,6 +257,24 @@ 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;

    }



    private boolean isAccessibilityFloatingMenuEnabled() {

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

                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, /* def= */ -1)

                == ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;

    }



    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider(R.xml.system_navigation_gesture_settings) {