Merge "Settings : Fix accessibility shortcut" into cm-10.1 (155f5926) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/Settings.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -379,12 +379,25 @@ public class Settings extends PreferenceActivity
		return mFirstHeader;
		}

		@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;
		}

		/**