Settings : Fix accessibility shortcut

Shortcuts like accessibility, have preferences with titleText rather than
titleRes as their title. Settings only had a override for titleText, which caused
preference screens inside accessibility to not work. This commit addresses that.

Reproducable via :

1. Create a settings accessibility shortcut.
2. Launch shortcut and try to open an of the services

Expected behaviour : Appropriate ToggleAccessibilityServicePreferenceFragment should open
Observed behaviour : Same Settings instead gets relaunched instead

Change-Id: I89b7539672cd7278d51f9e88bac1948669940e59

1 files changed, 13 insertions, 2 deletions

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 119f27f6c..5d786a425 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -381,10 +381,23 @@ public class Settings extends PreferenceActivity
 
     @Override
     public Intent onBuildStartFragmentIntent(String fragmentName, Bundle args,
+            CharSequence titleText, CharSequence shortTitleText) {
+        Intent intent = super.onBuildStartFragmentIntent(fragmentName, args,
+                titleText, shortTitleText);
+        onBuildStartFragmentIntentHelper(fragmentName, intent);
+        return intent;
+    }
+
+    @Override
+    public Intent onBuildStartFragmentIntent(String fragmentName, Bundle args,
             int titleRes, int shortTitleRes) {
         Intent intent = super.onBuildStartFragmentIntent(fragmentName, args,
                 titleRes, shortTitleRes);
+        onBuildStartFragmentIntentHelper(fragmentName, intent);
+        return intent;
+    }
 
+    private void onBuildStartFragmentIntentHelper(String fragmentName, Intent intent) {
         // some fragments want to avoid split actionbar
         if (DataUsageSummary.class.getName().equals(fragmentName) ||
                 PowerUsageSummary.class.getName().equals(fragmentName) ||
@@ -406,9 +419,7 @@ public class Settings extends PreferenceActivity
                 ZonePicker.class.getName().equals(fragmentName)) {
             intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);
         }
-
         intent.setClass(this, SubSettings.class);
-        return intent;
     }
 
     /**