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

Commit 9707e403 authored by Riley Jones's avatar Riley Jones Committed by Android (Google) Code Review
Browse files

Merge "Cleanup of deprecated A11y settings functions" into main

parents 3d626d8e 75500c02

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

+0 −16
Original line number Diff line number Diff line
@@ -218,22 +218,6 @@ public final class AccessibilityUtil { 
        return shortcutTypes;

    }



    /**

     * Converts {@link UserShortcutType} to key in Settings.

     *

     * @param shortcutType The shortcut type.

     * @return Mapping key in Settings.

     *

     * @deprecated use

     * {@link ShortcutUtils#convertToKey(int)} instead.

     *

     * (TODO 367414968: finish removal.)

     */

    @Deprecated

    static String convertKeyFromSettings(@UserShortcutType int shortcutType) {

        return ShortcutUtils.convertToKey(shortcutType);

    }



    /**

     * Gets the width of the screen.

     *

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

+0 −19
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import androidx.annotation.Nullable; 
import androidx.preference.Preference;



import com.android.settings.R;

import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;



import java.util.ArrayList;

import java.util.List;
@@ -116,24 +115,6 @@ public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeature 
        return mTileComponentName;

    }



    @Override

    CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) {

        final ComponentName componentName = getTileComponentName();

        if (componentName == null) {

            return null;

        }



        final CharSequence tileName = loadTileLabel(getPrefContext(), componentName);

        if (tileName == null) {

            return null;

        }



        final int titleResId = type == QuickSettingsTooltipType.GUIDE_TO_EDIT

                ? R.string.accessibility_service_qs_tooltip_content

                : R.string.accessibility_service_auto_added_qs_tooltip_content;

        return getString(titleResId, tileName);

    }



    @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

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

+0 −19
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ import androidx.annotation.Nullable; 


import com.android.internal.accessibility.common.ShortcutConstants;

import com.android.settings.R;

import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;

import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment;

import com.android.settingslib.accessibility.AccessibilityUtils;
@@ -245,24 +244,6 @@ public class ToggleAccessibilityServicePreferenceFragment extends 
        return mTileComponentName;

    }



    @Override

    CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) {

        final ComponentName componentName = getTileComponentName();

        if (componentName == null) {

            return null;

        }



        final CharSequence tileName = loadTileLabel(getPrefContext(), componentName);

        if (tileName == null) {

            return null;

        }



        final int titleResId = type == QuickSettingsTooltipType.GUIDE_TO_EDIT

                ? R.string.accessibility_service_qs_tooltip_content

                : R.string.accessibility_service_auto_added_qs_tooltip_content;

        return getString(titleResId, tileName);

    }



    @Override

    protected void updateSwitchBarToggleSwitch() {

        final boolean checked = isAccessibilityServiceEnabled();

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

+0 −8
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import android.view.ViewGroup; 
import androidx.annotation.VisibleForTesting;



import com.android.settings.R;

import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.widget.SettingsMainSwitchPreference;

import com.android.settingslib.search.SearchIndexable;
@@ -179,13 +178,6 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere 
        return COLOR_INVERSION_TILE_COMPONENT_NAME;

    }



    @Override

    CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) {

        return getText(type == QuickSettingsTooltipType.GUIDE_TO_EDIT

                ? R.string.accessibility_color_inversion_qs_tooltip_content

                : R.string.accessibility_color_inversion_auto_added_qs_tooltip_content);

    }



    @Override

    protected void updateSwitchBarToggleSwitch() {

        final boolean checked = Settings.Secure.getInt(getContentResolver(), ENABLED, OFF) == ON;

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

+0 −8
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.view.ViewGroup; 
import androidx.annotation.VisibleForTesting;



import com.android.settings.R;

import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.widget.SettingsMainSwitchPreference;

import com.android.settingslib.search.SearchIndexable;
@@ -194,13 +193,6 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF 
        return DALTONIZER_TILE_COMPONENT_NAME;

    }



    @Override

    CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) {

        return getText(type == QuickSettingsTooltipType.GUIDE_TO_EDIT

                ? R.string.accessibility_color_correction_qs_tooltip_content

                : R.string.accessibility_color_correction_auto_added_qs_tooltip_content);

    }



    @Override

    protected void updateSwitchBarToggleSwitch() {

        final boolean checked = Settings.Secure.getInt(getContentResolver(), ENABLED, OFF) == ON;