PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Android Beam toggle switch on Manta.

Browse Source 
Bug: 7974617
Change-Id: I9200c070a13415b5c0ca545211a31b3e9c544cac
This commit is contained in:
Martijn Coenen
2013-02-26 15:45:18 -08:00
parent 1022e801ba
commit 658508c8f6
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/settings/nfc/AndroidBeam.java
View File

@@ -35,10 +35,9 @@ import com.android.settings.R;
public class AndroidBeam extends Fragment public class AndroidBeam extends Fragment
implements CompoundButton.OnCheckedChangeListener { implements CompoundButton.OnCheckedChangeListener {
private View mView; private View mView;
private ImageView mImageView;
private NfcAdapter mNfcAdapter; private NfcAdapter mNfcAdapter;
private Switch mActionBarSwitch; private Switch mActionBarSwitch;
private CharSequence mOldActivityTitle;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@@ -48,19 +47,17 @@ public class AndroidBeam extends Fragment
mActionBarSwitch = new Switch(activity); mActionBarSwitch = new Switch(activity);
if (activity instanceof PreferenceActivity) { if (activity instanceof PreferenceActivity) {
PreferenceActivity preferenceActivity = (PreferenceActivity) activity; final int padding = activity.getResources().getDimensionPixelSize(
if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) { R.dimen.action_bar_switch_padding);
final int padding = activity.getResources().getDimensionPixelSize( mActionBarSwitch.setPaddingRelative(0, 0, padding, 0);
R.dimen.action_bar_switch_padding); activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
mActionBarSwitch.setPaddingRelative(0, 0, padding, 0); ActionBar.DISPLAY_SHOW_CUSTOM);
activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, activity.getActionBar().setCustomView(mActionBarSwitch, new ActionBar.LayoutParams(
ActionBar.DISPLAY_SHOW_CUSTOM); ActionBar.LayoutParams.WRAP_CONTENT,
activity.getActionBar().setCustomView(mActionBarSwitch, new ActionBar.LayoutParams( ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT, Gravity.CENTER_VERTICAL | Gravity.END));
ActionBar.LayoutParams.WRAP_CONTENT, mOldActivityTitle = activity.getActionBar().getTitle();
Gravity.CENTER_VERTICAL | Gravity.END)); activity.getActionBar().setTitle(R.string.android_beam_settings_title);
activity.getActionBar().setTitle(R.string.android_beam_settings_title);
}
} }
mActionBarSwitch.setOnCheckedChangeListener(this); mActionBarSwitch.setOnCheckedChangeListener(this);
@@ -77,6 +74,15 @@ public class AndroidBeam extends Fragment
return mView; return mView;
} }
@Override
public void onDestroyView() {
super.onDestroyView();
getActivity().getActionBar().setCustomView(null);
if (mOldActivityTitle != null) {
getActivity().getActionBar().setTitle(mOldActivityTitle);
}
}
private void initView(View view) { private void initView(View view) {
mActionBarSwitch.setOnCheckedChangeListener(this); mActionBarSwitch.setOnCheckedChangeListener(this);
mActionBarSwitch.setChecked(mNfcAdapter.isNdefPushEnabled()); mActionBarSwitch.setChecked(mNfcAdapter.isNdefPushEnabled());