commit 9bc8230dfe620f6c57213071af3cb9fbbb26ffa1
author Baligh Uddin <baligh@google.com> Tue Oct 23 11:29:42 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 23 11:29:42 2012 -0700
tree bc54caeca1e29606582e136e9b9759568a222e37
parent d8e9d3ae079bed8d93d5fc3c0219874be511121d
parent cd4116e37a7a2cd493f34723e0c10fe94e41a067

am cd4116e3: am 116a53c1: am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev

* commit 'cd4116e37a7a2cd493f34723e0c10fe94e41a067':
  Manually enter translations for msgid: 9014073093293520112

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);