Merge "Write default accessibility service only when user enter into corresponding page." into tm-dev am: 7a5ade7e9f am: 89e58480d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17655026
Change-Id: Ibef7b4a36294d8edf83331c69ed5f6df0f666f4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index bd8ee66..248bc12 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -157,7 +157,6 @@
}
}
- setupDefaultShortcutIfNecessary(getPrefContext());
final int resId = getPreferenceScreenResId();
if (resId <= 0) {
final PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(
@@ -226,6 +225,8 @@
if (mNeedsQSTooltipReshow) {
getView().post(this::showQuickSettingsTooltipIfNeeded);
}
+
+ writeDefaultShortcutTargetServiceToSettingsIfNeeded(getPrefContext());
}
@Override
@@ -792,8 +793,22 @@
/**
* 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)) {