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

Commit 89e58480 authored by Jason Hsu's avatar Jason Hsu Committed by Automerger Merge Worker
Browse files

Merge "Write default accessibility service only when user enter into... 

Merge "Write default accessibility service only when user enter into corresponding page." into tm-dev am: 7a5ade7e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17655026



Change-Id: I611b086a17f4ccf6a2884764a2a507a931806104
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3976cc03 7a5ade7e

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

+17 −2
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 
            }

        }



        setupDefaultShortcutIfNecessary(getPrefContext());

        final int resId = getPreferenceScreenResId();

        if (resId <= 0) {

            final PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(
@@ -226,6 +225,8 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 
        if (mNeedsQSTooltipReshow) {

            getView().post(this::showQuickSettingsTooltipIfNeeded);

        }



        writeDefaultShortcutTargetServiceToSettingsIfNeeded(getPrefContext());

    }



    @Override
@@ -792,8 +793,22 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 


    /**

     * Setups a configurable default if the setting has never been set.

     *

     * TODO(b/228562075): Remove this function when correcting the format in config file

     * `config_defaultAccessibilityService`.

     */

    private static void setupDefaultShortcutIfNecessary(Context context) {

    private void writeDefaultShortcutTargetServiceToSettingsIfNeeded(Context context) {

        if (mComponentName == null) {

            return;

        }



        final ComponentName defaultService = ComponentName.unflattenFromString(context.getString(

                com.android.internal.R.string.config_defaultAccessibilityService));

        // write default accessibility service only when user enter into corresponding page.

        if (!mComponentName.equals(defaultService)) {

            return;

        }



        final String targetKey = Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE;

        String targetString = Settings.Secure.getString(context.getContentResolver(), targetKey);

        if (!TextUtils.isEmpty(targetString)) {