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

Use SwitchBar for Android Beam Settings

Browse Source 
- follow up CL to 4193776698

Related to bug #14898161 On/Off switches must move down from Action Bar

Change-Id: I2e3ffb34a589b32deda9de19107f38041aa341c9
This commit is contained in:
Fabrice Di Meglio
2014-05-15 15:00:19 -07:00
parent 1303dbd52a
commit 072d98aba6
1 changed files with 22 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,88 +16,75 @@
package com.android.settings.nfc; package com.android.settings.nfc;
import android.app.ActionBar;
import android.app.Activity;
import android.app.Fragment; import android.app.Fragment;
import android.nfc.NfcAdapter; import android.nfc.NfcAdapter;
import android.os.Bundle; import android.os.Bundle;
import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.CompoundButton;
import android.widget.Switch; import android.widget.Switch;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import com.android.settings.widget.SwitchBar;
public class AndroidBeam extends Fragment public class AndroidBeam extends Fragment
implements CompoundButton.OnCheckedChangeListener { implements SwitchBar.OnSwitchChangeListener {
private View mView; private View mView;
private NfcAdapter mNfcAdapter; private NfcAdapter mNfcAdapter;
private Switch mActionBarSwitch; private SwitchBar mSwitchBar;
private Switch mSwitch;
private CharSequence mOldActivityTitle; private CharSequence mOldActivityTitle;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Activity activity = getActivity();
mActionBarSwitch = new Switch(activity.getActionBar().getThemedContext()); SettingsActivity activity = (SettingsActivity) getActivity();
if (activity instanceof SettingsActivity) {
final int padding = activity.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding);
mActionBarSwitch.setPaddingRelative(0, 0, padding, 0);
activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
ActionBar.DISPLAY_SHOW_CUSTOM);
activity.getActionBar().setCustomView(mActionBarSwitch, new ActionBar.LayoutParams(
ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT,
Gravity.CENTER_VERTICAL | Gravity.END));
mOldActivityTitle = activity.getActionBar().getTitle(); mOldActivityTitle = activity.getActionBar().getTitle();
activity.getActionBar().setTitle(R.string.android_beam_settings_title); activity.getActionBar().setTitle(R.string.android_beam_settings_title);
}
mActionBarSwitch.setOnCheckedChangeListener(this);
mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity()); mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
mActionBarSwitch.setChecked(mNfcAdapter.isNdefPushEnabled());
mSwitchBar = activity.getSwitchBar();
mSwitch = mSwitchBar.getSwitch();
mSwitch.setChecked(mNfcAdapter.isNdefPushEnabled());
} }
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
mView = inflater.inflate(R.layout.android_beam, container, false); mView = inflater.inflate(R.layout.android_beam, container, false);
initView(mView);
mSwitchBar.addOnSwitchChangeListener(this);
mSwitchBar.show();
mSwitch.setChecked(mNfcAdapter.isNdefPushEnabled());
return mView; return mView;
} }
@Override @Override
public void onDestroyView() { public void onDestroyView() {
super.onDestroyView(); super.onDestroyView();
getActivity().getActionBar().setCustomView(null); mSwitchBar.removeOnSwitchChangeListener(this);
mSwitchBar.hide();
if (mOldActivityTitle != null) { if (mOldActivityTitle != null) {
getActivity().getActionBar().setTitle(mOldActivityTitle); getActivity().getActionBar().setTitle(mOldActivityTitle);
} }
} }
private void initView(View view) {
mActionBarSwitch.setOnCheckedChangeListener(this);
mActionBarSwitch.setChecked(mNfcAdapter.isNdefPushEnabled());
}
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean desiredState) { public void onSwitchChanged(Switch switchView, boolean desiredState) {
boolean success = false; boolean success = false;
mActionBarSwitch.setEnabled(false); mSwitch.setEnabled(false);
if (desiredState) { if (desiredState) {
success = mNfcAdapter.enableNdefPush(); success = mNfcAdapter.enableNdefPush();
} else { } else {
success = mNfcAdapter.disableNdefPush(); success = mNfcAdapter.disableNdefPush();
} }
if (success) { if (success) {
mActionBarSwitch.setChecked(desiredState); mSwitch.setChecked(desiredState);
} }
mActionBarSwitch.setEnabled(true); mSwitch.setEnabled(true);
} }
} }