diff options
author | Peter_Liang <peterliang@google.com> | 2020-05-11 10:36:56 +0800 |
---|---|---|
committer | Peter_Liang <peterliang@google.com> | 2020-05-11 11:22:36 +0800 |
commit | 0cba2fe1339ab80f5b2fa27ca378d90bde7d2348 (patch) | |
tree | 58100fd69a79a5ac4abd18de42913a4dcb475763 /src/com/android/settings/accessibility | |
parent | 9454ab07a8fbbb6cdcc11e921cbb6d3b821d40bb (diff) | |
download | packages_apps_Settings-0cba2fe1339ab80f5b2fa27ca378d90bde7d2348.tar.gz packages_apps_Settings-0cba2fe1339ab80f5b2fa27ca378d90bde7d2348.tar.bz2 packages_apps_Settings-0cba2fe1339ab80f5b2fa27ca378d90bde7d2348.zip |
Fix that the inconsistent accessibility content pages under Setup Wizard.
Root cause:
Exist the inconsistent conditions.
Next:
1. Move all the condition related to description to the back fragment to determine whether to show the footer preference or not.
2. Add extras relate to animated image.
Bug: 156180932
Test: manual test
Change-Id: I56d4ead6c5121637a2da2e074ef9bff2a8146732
Diffstat (limited to 'src/com/android/settings/accessibility')
-rw-r--r-- | src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java | 3 | ||||
-rw-r--r-- | src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java b/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java index 73df875a2b..e91f2a2ff9 100644 --- a/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java @@ -139,9 +139,6 @@ public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment { AccessibilityUtils.getEnabledServicesFromSettings(getActivity()); final boolean serviceEnabled = enabledServices.contains(componentName); String description = info.loadDescription(getActivity().getPackageManager()); - if (TextUtils.isEmpty(description)) { - description = getString(R.string.accessibility_service_default_description); - } if (serviceEnabled && info.crashed) { // Update the summaries for services that have crashed. diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java index 090e5d4849..ffc8335c88 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java @@ -24,7 +24,6 @@ import android.content.ComponentName; import android.content.Context; import android.content.pm.ServiceInfo; import android.os.Bundle; -import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -172,11 +171,10 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm extras.putString(AccessibilitySettings.EXTRA_TITLE, title); String description = info.loadDescription(getPackageManager()); - if (TextUtils.isEmpty(description)) { - description = getString(R.string.accessibility_service_default_description); - } extras.putString(AccessibilitySettings.EXTRA_SUMMARY, description); + extras.putInt(AccessibilitySettings.EXTRA_ANIMATED_IMAGE_RES, info.getAnimatedImageRes()); + final String htmlDescription = info.loadHtmlDescription(getPackageManager()); extras.putString(AccessibilitySettings.EXTRA_HTML_DESCRIPTION, htmlDescription); } |