Merge "Fix crash when rotating screen in a few screens." into nyc-dev (27288746) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/UserDictionarySettings.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -71,12 +71,6 @@ public class UserDictionarySettings extends ListFragment {

		protected String mLocale;

		@Override
		public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
		}

		@Override
		public View onCreateView(
		LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
		@@ -87,6 +81,7 @@ public class UserDictionarySettings extends ListFragment {
		@Override
		public void onActivityCreated(Bundle savedInstanceState) {
		super.onActivityCreated(savedInstanceState);
		getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);

		final Intent intent = getActivity().getIntent();
		final String localeFromIntent =

+0 −3

Original line number	Diff line number	Diff line
		@@ -260,17 +260,14 @@ public class ManageApplications extends InstrumentedFragment
		mSortOrder = R.id.sort_order_size;
		} else if (className.equals(UsageAccessSettingsActivity.class.getName())) {
		mListType = LIST_TYPE_USAGE_ACCESS;
		getActivity().getActionBar().setTitle(R.string.usage_access_title);
		} else if (className.equals(HighPowerApplicationsActivity.class.getName())) {
		mListType = LIST_TYPE_HIGH_POWER;
		// Default to showing system.
		mShowSystem = true;
		} else if (className.equals(OverlaySettingsActivity.class.getName())) {
		mListType = LIST_TYPE_OVERLAY;
		getActivity().getActionBar().setTitle(R.string.system_alert_window_access_title);
		} else if (className.equals(WriteSettingsActivity.class.getName())) {
		mListType = LIST_TYPE_WRITE_SETTINGS;
		getActivity().getActionBar().setTitle(R.string.write_settings_title);
		} else {
		mListType = LIST_TYPE_MAIN;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,12 +52,12 @@ public class UserDictionaryList extends SettingsPreferenceFragment {
		public void onCreate(Bundle icicle) {
		super.onCreate(icicle);
		setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getActivity()));
		getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
		}

		@Override
		public void onActivityCreated(Bundle savedInstanceState) {
		super.onActivityCreated(savedInstanceState);
		getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);

		final Intent intent = getActivity().getIntent();
		final String localeFromIntent =

+2 −6

Original line number	Diff line number	Diff line
		@@ -52,12 +52,6 @@ public class AndroidBeam extends InstrumentedFragment
		@Override
		public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);

		final ActionBar actionBar = getActivity().getActionBar();

		mOldActivityTitle = actionBar.getTitle();
		actionBar.setTitle(R.string.android_beam_settings_title);

		mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
		setHasOptionsMenu(true);
		}
		@@ -94,6 +88,8 @@ public class AndroidBeam extends InstrumentedFragment

		SettingsActivity activity = (SettingsActivity) getActivity();

		mOldActivityTitle = activity.getActionBar().getTitle();

		mSwitchBar = activity.getSwitchBar();
		if (mBeamDisallowedByOnlyAdmin) {
		mSwitchBar.hide();