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

Dynamic Select-To-Speak and Talkback setFragment style on SUW Welcome Screen.

Browse Source 
Check the APK target SDK to use corresponding fragment to avoid wrong
status before these app release to R.

Bug: 147997595
Bug: 148394224
Bug: 148438898
Test: Manual test
Change-Id: I3a4ca6b8566f3f731b651e1f785f4fc18319ca89
This commit is contained in:
menghanli
2020-02-04 13:45:27 +08:00
parent f38bff9e0b
commit 6287ee027c
5 changed files with 111 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.accessibility;
import static com.android.settings.accessibility.AccessibilityUtil.AccessibilityServiceFragmentType.LEGACY;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
@@ -99,9 +101,11 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm
public void onResume() {
super.onResume();
updateAccessibilityServicePreference(mScreenReaderPreference,
findService(SCREEN_READER_PACKAGE_NAME, SCREEN_READER_SERVICE_NAME));
SCREEN_READER_PACKAGE_NAME, SCREEN_READER_SERVICE_NAME,
LegacyToggleScreenReaderPreferenceFragmentForSetupWizard.class.getName());
updateAccessibilityServicePreference(mSelectToSpeakPreference,
findService(SELECT_TO_SPEAK_PACKAGE_NAME, SELECT_TO_SPEAK_SERVICE_NAME));
SELECT_TO_SPEAK_PACKAGE_NAME, SELECT_TO_SPEAK_SERVICE_NAME,
LegacyToggleSelectToSpeakPreferenceFragmentForSetupWizard.class.getName());
configureMagnificationPreferenceIfNeeded(mDisplayMagnificationPreference);
}
@@ -143,7 +147,8 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm
}
private void updateAccessibilityServicePreference(Preference preference,
AccessibilityServiceInfo info) {
String packageName, String serviceName, String targetLegacyFragment) {
final AccessibilityServiceInfo info = findService(packageName, serviceName);
if (info == null) {
getPreferenceScreen().removePreference(preference);
return;
@@ -154,6 +159,9 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm
preference.setTitle(title);
ComponentName componentName = new ComponentName(serviceInfo.packageName, serviceInfo.name);
preference.setKey(componentName.flattenToString());
if (AccessibilityUtil.getAccessibilityServiceFragmentType(info) == LEGACY) {
preference.setFragment(targetLegacyFragment);
}
// Update the extras.
Bundle extras = preference.getExtras();