PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I611b086a17f4ccf6a2884764a2a507a931806104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jason Hsu
2022-04-12 10:39:43 +00:00
committed by Automerger Merge Worker
parent 3976cc031e 7a5ade7e9f
commit 89e58480d3
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
View File

@@ -157,7 +157,6 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
} }
} }
setupDefaultShortcutIfNecessary(getPrefContext());
final int resId = getPreferenceScreenResId(); final int resId = getPreferenceScreenResId();
if (resId <= 0) { if (resId <= 0) {
final PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen( final PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(
@@ -226,6 +225,8 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
if (mNeedsQSTooltipReshow) { if (mNeedsQSTooltipReshow) {
getView().post(this::showQuickSettingsTooltipIfNeeded); getView().post(this::showQuickSettingsTooltipIfNeeded);
} }
writeDefaultShortcutTargetServiceToSettingsIfNeeded(getPrefContext());
} }
@Override @Override
@@ -792,8 +793,22 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
/** /**
* Setups a configurable default if the setting has never been set. * 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; final String targetKey = Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE;
String targetString = Settings.Secure.getString(context.getContentResolver(), targetKey); String targetString = Settings.Secure.getString(context.getContentResolver(), targetKey);
if (!TextUtils.isEmpty(targetString)) { if (!TextUtils.isEmpty(targetString)) {