commit 016f875ae78cdb1a2d52f89e5347c3e561b7bb3e
author Fan Zhang <zhfan@google.com> Fri May 06 15:39:52 2016 -0700
committer Fan Zhang <zhfan@google.com> Mon May 09 17:56:06 2016 +0000
tree 10317803b78a0fd38552ef30bfd71e4d703bad45
parent 04b25af149ba8e4c38cfe17fe9caf246a598e8e3

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

diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index 73e9cf5..19d34ef 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -72,12 +72,6 @@
     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) {
         return inflater.inflate(
@@ -87,6 +81,7 @@
     @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 =

src/com/android/settings/applications/ManageApplications.java

diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 572c295..281b758 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -260,17 +260,14 @@
             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;
         }

src/com/android/settings/inputmethod/UserDictionaryList.java

diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java
index a0ab3fc..ed5b116 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryList.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryList.java
@@ -52,12 +52,12 @@
     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 =

src/com/android/settings/nfc/AndroidBeam.java

diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index cc4c4af..31249e6 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -52,12 +52,6 @@
     @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 @@
 
         SettingsActivity activity = (SettingsActivity) getActivity();
 
+        mOldActivityTitle = activity.getActionBar().getTitle();
+
         mSwitchBar = activity.getSwitchBar();
         if (mBeamDisallowedByOnlyAdmin) {
             mSwitchBar.hide();