commit f66c3603fec7c345b14ce57ceec4a1e71233c83d
author Michael Jurka <mikejurka@google.com> Fri Sep 21 01:15:29 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 21 01:15:29 2012 -0700
tree 3f6fd808d40edefa1d7a1a69f94afae8e0b2eeec
parent 816ef1db92ecc0b82fa58d6efd8d56030b29f0e4
parent cbf5be09b072a7caa7558a30cfdf5cf1d584dc84

am cbf5be09: am 406b01f4: Merge "Add support for changing status widget on security screen" into jb-mr1-dev

* commit 'cbf5be09b072a7caa7558a30cfdf5cf1d584dc84':
  Add support for changing status widget on security screen

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 032681a..bf02c13 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -38,7 +38,6 @@
     private ImageView mImageView;
     private NfcAdapter mNfcAdapter;
     private Switch mActionBarSwitch;
-    private CharSequence mOldActivityTitle;
 
 
     @Override
@@ -50,6 +49,7 @@
 
         if (activity instanceof PreferenceActivity) {
             PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
+            if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
                 final int padding = activity.getResources().getDimensionPixelSize(
                         R.dimen.action_bar_switch_padding);
                 mActionBarSwitch.setPadding(0, 0, padding, 0);
@@ -59,10 +59,8 @@
                         ActionBar.LayoutParams.WRAP_CONTENT,
                         ActionBar.LayoutParams.WRAP_CONTENT,
                         Gravity.CENTER_VERTICAL | Gravity.END));
-                if (!preferenceActivity.onIsMultiPane() || preferenceActivity.onIsHidingHeaders()) {
-                    mOldActivityTitle = getActivity().getTitle();
-                    activity.getActionBar().setTitle(R.string.android_beam_settings_title);
-                }
+                activity.getActionBar().setTitle(R.string.android_beam_settings_title);
+            }
         }
 
         mActionBarSwitch.setOnCheckedChangeListener(this);
@@ -78,14 +76,6 @@
         initView(mView);
         return mView;
     }
-    @Override
-    public void onDestroyView() {
-        getActivity().getActionBar().setCustomView(null);
-        if (mOldActivityTitle != null) {
-            getActivity().getActionBar().setTitle(mOldActivityTitle);
-        }
-        super.onDestroyView();
-    }
 
     private void initView(View view) {
         mActionBarSwitch.setOnCheckedChangeListener(this);