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
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user