commit bb979153ede6179b9300ee2139d21213b6b3cd3a
author Julia Reynolds <juliacr@google.com> Mon Apr 20 17:40:18 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 20 17:40:18 2020 +0000
tree b50e12796f50f5886e8fb473711fc137903b5d61
parent 1be2666d11fe25c21c7429acdb089f1fcd0fea3c
parent 6c8451a89fe8aea5d6cec27926cef63d74159b68

Merge "Set explicit back target for history" into rvc-dev

src/com/android/settings/accessibility/AccessibilitySettings.java

diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 3b3c2c5..17750df 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -105,7 +105,6 @@
     static final String EXTRA_TITLE_RES = "title_res";
     static final String EXTRA_RESOLVE_INFO = "resolve_info";
     static final String EXTRA_SUMMARY = "summary";
-    static final String EXTRA_SUMMARY_RES = "summary_res";
     static final String EXTRA_SETTINGS_TITLE = "settings_title";
     static final String EXTRA_COMPONENT_NAME = "component_name";
     static final String EXTRA_SETTINGS_COMPONENT_NAME = "settings_component_name";

src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java

diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 0c83ef3..20ef7bc 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -363,10 +363,7 @@
         }
 
         // Summary.
-        if (arguments.containsKey(AccessibilitySettings.EXTRA_SUMMARY_RES)) {
-            final int summary = arguments.getInt(AccessibilitySettings.EXTRA_SUMMARY_RES);
-            createFooterPreference(getText(summary));
-        } else if (arguments.containsKey(AccessibilitySettings.EXTRA_SUMMARY)) {
+        if (arguments.containsKey(AccessibilitySettings.EXTRA_SUMMARY)) {
             final CharSequence summary = arguments.getCharSequence(
                     AccessibilitySettings.EXTRA_SUMMARY);
             createFooterPreference(summary);