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

Commit 91d2dbe2 authored by Jason Hsu's avatar Jason Hsu Committed by Android (Google) Code Review
Browse files

Merge "Accessibility shortcut primary action - remove search and help icon" into rvc-dev

parents 58081f2c 693068f5

src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java

+9 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ import android.os.Bundle; 
import android.os.UserHandle;

import android.text.TextUtils;

import android.util.Log;

import android.view.Menu;

import android.view.MenuInflater;

import android.view.View;

import android.view.accessibility.AccessibilityManager;
@@ -98,6 +100,13 @@ public class LaunchAccessibilityActivityPreferenceFragment extends 
        showDialog(DialogEnums.EDIT_SHORTCUT);

    }



    @Override

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        // Do not call super. We don't want to see the "Help & feedback" option on this page so as

        // not to confuse users who think they might be able to send feedback about a specific

        // accessibility service from this page.

    }



    @Override

    protected void updateToggleServiceTitle(SwitchPreference switchPreference) {

        final AccessibilityShortcutInfo info = getAccessibilityShortcutInfo();

src/com/android/settings/accessibility/MagnificationPreferenceFragment.java

+11 −6
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ import android.content.res.Resources; 
import android.os.Bundle;

import android.provider.Settings;

import android.text.TextUtils;

import android.view.Menu;

import android.view.MenuInflater;

import android.view.accessibility.AccessibilityManager;



import androidx.annotation.VisibleForTesting;
@@ -33,8 +35,6 @@ import androidx.preference.Preference; 
import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.actionbar.SearchMenuController;

import com.android.settings.support.actionbar.HelpResourceProvider;

import com.android.settingslib.search.SearchIndexable;



import java.util.List;
@@ -96,14 +96,19 @@ public final class MagnificationPreferenceFragment extends DashboardFragment { 
            // If invoked from SUW, redirect to fragment instrumented for Vision Settings metrics

            preference.setFragment(

                    ToggleScreenMagnificationPreferenceFragmentForSetupWizard.class.getName());

            Bundle args = preference.getExtras();

            // Copy from AccessibilitySettingsForSetupWizardActivity, hide search and help menu

            args.putInt(HelpResourceProvider.HELP_URI_RESOURCE_KEY, 0);

            args.putBoolean(SearchMenuController.NEED_SEARCH_ICON_IN_ACTION_BAR, false);

        }

        return super.onPreferenceTreeClick(preference);

    }



    @Override

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        if (mLaunchedFromSuw) {

            // Do not call super. We don't want to see the "Help & feedback" on OOBE page.

        } else {

            super.onCreateOptionsMenu(menu, inflater);

        }

    }



    static CharSequence getConfigurationWarningStringForSecureSettingsKey(String key,

            Context context) {

        if (!Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED.equals(key)) {