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

Merge "Fix that the inconsistent accessibility content pages under Setup Wizard." into rvc-dev

Browse Source
This commit is contained in:
PETER LIANG
2020-05-11 07:28:18 +00:00
committed by Android (Google) Code Review
parent 72948ab538 0cba2fe133
commit 7a31f2da60
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
View File

@@ -139,9 +139,6 @@ public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment {
AccessibilityUtils.getEnabledServicesFromSettings(getActivity()); AccessibilityUtils.getEnabledServicesFromSettings(getActivity());
final boolean serviceEnabled = enabledServices.contains(componentName); final boolean serviceEnabled = enabledServices.contains(componentName);
String description = info.loadDescription(getActivity().getPackageManager()); String description = info.loadDescription(getActivity().getPackageManager());
if (TextUtils.isEmpty(description)) {
description = getString(R.string.accessibility_service_default_description);
}
if (serviceEnabled && info.crashed) { if (serviceEnabled && info.crashed) {
// Update the summaries for services that have crashed. // Update the summaries for services that have crashed.

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

@@ -24,7 +24,6 @@ import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.pm.ServiceInfo; import android.content.pm.ServiceInfo;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -172,11 +171,10 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm
extras.putString(AccessibilitySettings.EXTRA_TITLE, title); extras.putString(AccessibilitySettings.EXTRA_TITLE, title);
String description = info.loadDescription(getPackageManager()); String description = info.loadDescription(getPackageManager());
if (TextUtils.isEmpty(description)) {
description = getString(R.string.accessibility_service_default_description);
}
extras.putString(AccessibilitySettings.EXTRA_SUMMARY, description); extras.putString(AccessibilitySettings.EXTRA_SUMMARY, description);
extras.putInt(AccessibilitySettings.EXTRA_ANIMATED_IMAGE_RES, info.getAnimatedImageRes());
final String htmlDescription = info.loadHtmlDescription(getPackageManager()); final String htmlDescription = info.loadHtmlDescription(getPackageManager());
extras.putString(AccessibilitySettings.EXTRA_HTML_DESCRIPTION, htmlDescription); extras.putString(AccessibilitySettings.EXTRA_HTML_DESCRIPTION, htmlDescription);
} }