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

Commit e02709f4 authored by Thomas Leu's avatar Thomas Leu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cherrypicker-L72500000958763307:N21300001339715669" into udc-dev 

* changes:
  Do not disable the default shortcut at the end of setup.
  Revert "Fix the accessibility shortcut funtionaility."
parents b2eae6ca 10de3c6d

core/java/com/android/internal/accessibility/AccessibilityShortcutController.java

+5 −0
Original line number Diff line number Diff line
@@ -650,6 +650,11 @@ public class AccessibilityShortcutController { 
         *

         */

        private void setEmptyShortcutTargetIfNeeded() {

            if (hasFeatureLeanback()) {

                // Do not disable the default shortcut on TV.

                return;

            }



            final ContentResolver contentResolver = mContext.getContentResolver();



            final String shortcutTargets = Settings.Secure.getStringForUser(contentResolver,

packages/SettingsLib/src/com/android/settingslib/accessibility/AccessibilityUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ public class AccessibilityUtils { 
        final String currentShortcutServiceId = Settings.Secure.getStringForUser(

                context.getContentResolver(), Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE,

                userId);

        if (!TextUtils.isEmpty(currentShortcutServiceId)) {

        if (currentShortcutServiceId != null) {

            return currentShortcutServiceId;

        }

        return context.getString(R.string.config_defaultAccessibilityService);