From 016f875ae78cdb1a2d52f89e5347c3e561b7bb3e Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Fri, 6 May 2016 15:39:52 -0700
Subject: [PATCH] Fix crash when rotating screen in a few screens.

Bug: 26946312

Fixed in the following screens:
Apps > Gear > Special Access > Modify system settings
Apps > Gear > Special Access > Draw over other apps
Apps > Gear > Special Access > Apps with usage access
Language & input > Personal dictionary
Wireless & networks (More) > Android Beam

Change-Id: I0b9bd6c19f710302625dd87989e9d4ce3c96a9a2
---
 src/com/android/settings/UserDictionarySettings.java      | 7 +------
 .../android/settings/applications/ManageApplications.java | 3 ---
 .../android/settings/inputmethod/UserDictionaryList.java  | 2 +-
 src/com/android/settings/nfc/AndroidBeam.java             | 8 ++------
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index 73e9cf5251c..19d34ef5248 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -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 =
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 572c295f7dd..281b75867f6 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -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;
         }
diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java
index a0ab3fc0488..ed5b116ecc6 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryList.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryList.java
@@ -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 =
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index cc4c4afb486..31249e63280 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -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();