Replace CheckBoxPreference with SwitchPreference
- voicemail notification vibrant settings
- accessibility settings
- calling account received incoming calls
- additional settings -> callwaiting
- cdma voice privacy
- additional setting -> gsm call waiting
- turn on video calling
- auto retry
- remove cell broadcast related settings from phone package
Bug: 37746921
Test: Manual test
Change-Id: I3ddf09bf5430f0f5304f3ce5020282120db4d75e
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 3e0e019..8386c34 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -33,11 +33,11 @@
import android.os.PersistableBundle;
import android.os.UserHandle;
import android.os.UserManager;
-import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
import android.provider.Settings;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
@@ -108,9 +108,9 @@
private SubscriptionInfoHelper mSubscriptionInfoHelper;
private TelecomManager mTelecomManager;
- private CheckBoxPreference mButtonAutoRetry;
+ private SwitchPreference mButtonAutoRetry;
private PreferenceScreen mVoicemailSettingsScreen;
- private CheckBoxPreference mEnableVideoCalling;
+ private SwitchPreference mEnableVideoCalling;
/*
* Click Listeners, handle click based on objects attached to UI.
@@ -234,9 +234,9 @@
maybeHideVoicemailSettings();
- mButtonAutoRetry = (CheckBoxPreference) findPreference(BUTTON_RETRY_KEY);
+ mButtonAutoRetry = (SwitchPreference) findPreference(BUTTON_RETRY_KEY);
- mEnableVideoCalling = (CheckBoxPreference) findPreference(ENABLE_VIDEO_CALLING_KEY);
+ mEnableVideoCalling = (SwitchPreference) findPreference(ENABLE_VIDEO_CALLING_KEY);
PersistableBundle carrierConfig =
PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
diff --git a/src/com/android/phone/CallWaitingCheckBoxPreference.java b/src/com/android/phone/CallWaitingSwitchPreference.java
similarity index 82%
rename from src/com/android/phone/CallWaitingCheckBoxPreference.java
rename to src/com/android/phone/CallWaitingSwitchPreference.java
index bda8b3b..3f248ae 100644
--- a/src/com/android/phone/CallWaitingCheckBoxPreference.java
+++ b/src/com/android/phone/CallWaitingSwitchPreference.java
@@ -9,29 +9,27 @@
import android.os.AsyncResult;
import android.os.Handler;
import android.os.Message;
-import android.preference.CheckBoxPreference;
+import android.preference.SwitchPreference;
import android.util.AttributeSet;
import android.util.Log;
-import com.android.internal.telephony.Phone;
-
-public class CallWaitingCheckBoxPreference extends CheckBoxPreference {
- private static final String LOG_TAG = "CallWaitingCheckBoxPreference";
+public class CallWaitingSwitchPreference extends SwitchPreference {
+ private static final String LOG_TAG = "CallWaitingSwitchPreference";
private final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
private final MyHandler mHandler = new MyHandler();
private Phone mPhone;
private TimeConsumingPreferenceListener mTcpListener;
- public CallWaitingCheckBoxPreference(Context context, AttributeSet attrs, int defStyle) {
+ public CallWaitingSwitchPreference(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
}
- public CallWaitingCheckBoxPreference(Context context, AttributeSet attrs) {
- this(context, attrs, com.android.internal.R.attr.checkBoxPreferenceStyle);
+ public CallWaitingSwitchPreference(Context context, AttributeSet attrs) {
+ this(context, attrs, com.android.internal.R.attr.switchPreferenceStyle);
}
- public CallWaitingCheckBoxPreference(Context context) {
+ public CallWaitingSwitchPreference(Context context) {
this(context, null);
}
@@ -81,9 +79,9 @@
if (mTcpListener != null) {
if (msg.arg2 == MESSAGE_SET_CALL_WAITING) {
- mTcpListener.onFinished(CallWaitingCheckBoxPreference.this, false);
+ mTcpListener.onFinished(CallWaitingSwitchPreference.this, false);
} else {
- mTcpListener.onFinished(CallWaitingCheckBoxPreference.this, true);
+ mTcpListener.onFinished(CallWaitingSwitchPreference.this, true);
}
}
@@ -93,7 +91,7 @@
ar.exception);
}
if (mTcpListener != null) {
- mTcpListener.onException(CallWaitingCheckBoxPreference.this,
+ mTcpListener.onException(CallWaitingSwitchPreference.this,
(CommandException)ar.exception);
}
} else if (ar.userObj instanceof Throwable || ar.exception != null) {
@@ -102,7 +100,7 @@
Log.d(LOG_TAG, "handleGetCallWaitingResponse: Exception" + ar.exception);
}
if (mTcpListener != null) {
- mTcpListener.onError(CallWaitingCheckBoxPreference.this, RESPONSE_ERROR);
+ mTcpListener.onError(CallWaitingSwitchPreference.this, RESPONSE_ERROR);
}
} else {
if (DBG) {
diff --git a/src/com/android/phone/CdmaCallOptions.java b/src/com/android/phone/CdmaCallOptions.java
index 4a5f229..bbd0069 100644
--- a/src/com/android/phone/CdmaCallOptions.java
+++ b/src/com/android/phone/CdmaCallOptions.java
@@ -25,10 +25,10 @@
import android.os.Handler;
import android.os.Message;
import android.os.PersistableBundle;
-import android.preference.CheckBoxPreference;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
import android.telephony.CarrierConfigManager;
import android.util.Log;
import android.view.MenuItem;
@@ -38,7 +38,7 @@
private final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
private static final String BUTTON_VP_KEY = "button_voice_privacy_key";
- private CheckBoxPreference mButtonVoicePrivacy;
+ private SwitchPreference mButtonVoicePrivacy;
@Override
protected void onCreate(Bundle icicle) {
@@ -50,7 +50,7 @@
subInfoHelper.setActionBarTitle(
getActionBar(), getResources(), R.string.labelCdmaMore_with_label);
- mButtonVoicePrivacy = (CheckBoxPreference) findPreference(BUTTON_VP_KEY);
+ mButtonVoicePrivacy = (SwitchPreference) findPreference(BUTTON_VP_KEY);
PersistableBundle carrierConfig;
if (subInfoHelper.hasSubId()) {
carrierConfig = PhoneGlobals.getInstance().getCarrierConfigForSubId(
diff --git a/src/com/android/phone/CdmaVoicePrivacyCheckBoxPreference.java b/src/com/android/phone/CdmaVoicePrivacySwitchPreference.java
similarity index 84%
rename from src/com/android/phone/CdmaVoicePrivacyCheckBoxPreference.java
rename to src/com/android/phone/CdmaVoicePrivacySwitchPreference.java
index a5ff37e..5a99bb7 100644
--- a/src/com/android/phone/CdmaVoicePrivacyCheckBoxPreference.java
+++ b/src/com/android/phone/CdmaVoicePrivacySwitchPreference.java
@@ -22,29 +22,29 @@
import android.os.AsyncResult;
import android.os.Handler;
import android.os.Message;
-import android.preference.CheckBoxPreference;
+import android.preference.SwitchPreference;
import android.util.AttributeSet;
import android.util.Log;
-public class CdmaVoicePrivacyCheckBoxPreference extends CheckBoxPreference {
- private static final String LOG_TAG = "CdmaVoicePrivacyCheckBoxPreference";
+public class CdmaVoicePrivacySwitchPreference extends SwitchPreference {
+ private static final String LOG_TAG = "CdmaVoicePrivacySwitchPreference";
private final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
Phone phone;
private MyHandler mHandler = new MyHandler();
- public CdmaVoicePrivacyCheckBoxPreference(Context context, AttributeSet attrs, int defStyle) {
+ public CdmaVoicePrivacySwitchPreference(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
phone = PhoneGlobals.getPhone();
phone.getEnhancedVoicePrivacy(mHandler.obtainMessage(MyHandler.MESSAGE_GET_VP));
}
- public CdmaVoicePrivacyCheckBoxPreference(Context context, AttributeSet attrs) {
- this(context, attrs, com.android.internal.R.attr.checkBoxPreferenceStyle);
+ public CdmaVoicePrivacySwitchPreference(Context context, AttributeSet attrs) {
+ this(context, attrs, com.android.internal.R.attr.switchPreferenceStyle);
}
- public CdmaVoicePrivacyCheckBoxPreference(Context context) {
+ public CdmaVoicePrivacySwitchPreference(Context context) {
this(context, null);
}
diff --git a/src/com/android/phone/GsmUmtsAdditionalCallOptions.java b/src/com/android/phone/GsmUmtsAdditionalCallOptions.java
index 88d32fb..082eaa9 100644
--- a/src/com/android/phone/GsmUmtsAdditionalCallOptions.java
+++ b/src/com/android/phone/GsmUmtsAdditionalCallOptions.java
@@ -1,7 +1,6 @@
package com.android.phone;
import android.app.ActionBar;
-import android.content.Intent;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceScreen;
@@ -20,7 +19,7 @@
private static final String BUTTON_CW_KEY = "button_cw_key";
private CLIRListPreference mCLIRButton;
- private CallWaitingCheckBoxPreference mCWButton;
+ private CallWaitingSwitchPreference mCWButton;
private final ArrayList<Preference> mPreferences = new ArrayList<Preference>();
private int mInitIndex = 0;
@@ -40,7 +39,7 @@
PreferenceScreen prefSet = getPreferenceScreen();
mCLIRButton = (CLIRListPreference) prefSet.findPreference(BUTTON_CLIR_KEY);
- mCWButton = (CallWaitingCheckBoxPreference) prefSet.findPreference(BUTTON_CW_KEY);
+ mCWButton = (CallWaitingSwitchPreference) prefSet.findPreference(BUTTON_CW_KEY);
mPreferences.add(mCLIRButton);
mPreferences.add(mCWButton);
@@ -84,8 +83,8 @@
if (mInitIndex < mPreferences.size()-1 && !isFinishing()) {
mInitIndex++;
Preference pref = mPreferences.get(mInitIndex);
- if (pref instanceof CallWaitingCheckBoxPreference) {
- ((CallWaitingCheckBoxPreference) pref).init(this, false, mPhone);
+ if (pref instanceof CallWaitingSwitchPreference) {
+ ((CallWaitingSwitchPreference) pref).init(this, false, mPhone);
}
}
super.onFinished(preference, reading);
diff --git a/src/com/android/phone/settings/AccessibilitySettingsFragment.java b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
index 0c186a9..af7d4bf 100644
--- a/src/com/android/phone/settings/AccessibilitySettingsFragment.java
+++ b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
@@ -19,7 +19,7 @@
import android.content.Context;
import android.media.AudioManager;
import android.os.Bundle;
-import android.preference.CheckBoxPreference;
+import android.preference.SwitchPreference;
import android.preference.Preference;
import android.preference.PreferenceFragment;
import android.preference.PreferenceScreen;
@@ -66,7 +66,7 @@
private AudioManager mAudioManager;
private TtyModeListPreference mButtonTty;
- private CheckBoxPreference mButtonHac;
+ private SwitchPreference mButtonHac;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -79,7 +79,7 @@
mButtonTty = (TtyModeListPreference) findPreference(
getResources().getString(R.string.tty_mode_key));
- mButtonHac = (CheckBoxPreference) findPreference(BUTTON_HAC_KEY);
+ mButtonHac = (SwitchPreference) findPreference(BUTTON_HAC_KEY);
if (PhoneGlobals.getInstance().phoneMgr.isTtyModeSupported()) {
mButtonTty.init();
diff --git a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
index 07402db..670f98d 100644
--- a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
+++ b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
@@ -8,11 +8,11 @@
import android.net.sip.SipManager;
import android.os.Bundle;
import android.os.UserManager;
-import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceCategory;
import android.preference.PreferenceFragment;
+import android.preference.SwitchPreference;
import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
@@ -73,7 +73,7 @@
private AccountSelectionPreference mDefaultOutgoingAccount;
private ListPreference mUseSipCalling;
- private CheckBoxPreference mSipReceiveCallsPreference;
+ private SwitchPreference mSipReceiveCallsPreference;
private SipPreferences mSipPreferences;
@Override
@@ -173,7 +173,7 @@
mUseSipCalling.setValueIndex(optionsValueIndex);
mUseSipCalling.setSummary(mUseSipCalling.getEntry());
- mSipReceiveCallsPreference = (CheckBoxPreference)
+ mSipReceiveCallsPreference = (SwitchPreference)
getPreferenceScreen().findPreference(SIP_RECEIVE_CALLS_PREF_KEY);
mSipReceiveCallsPreference.setEnabled(SipUtil.isPhoneIdle(getActivity()));
mSipReceiveCallsPreference.setChecked(
diff --git a/src/com/android/phone/settings/VoicemailSettingsActivity.java b/src/com/android/phone/settings/VoicemailSettingsActivity.java
index 213baa0..d0e0656 100644
--- a/src/com/android/phone/settings/VoicemailSettingsActivity.java
+++ b/src/com/android/phone/settings/VoicemailSettingsActivity.java
@@ -25,10 +25,10 @@
import android.os.Handler;
import android.os.Message;
import android.os.UserManager;
-import android.preference.CheckBoxPreference;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
import android.provider.ContactsContract.CommonDataKinds;
import android.telephony.TelephonyManager;
import android.text.BidiFormatter;
@@ -200,7 +200,7 @@
private VoicemailProviderListPreference mVoicemailProviders;
private PreferenceScreen mVoicemailSettings;
private VoicemailRingtonePreference mVoicemailNotificationRingtone;
- private CheckBoxPreference mVoicemailNotificationVibrate;
+ private SwitchPreference mVoicemailNotificationVibrate;
//*********************************************************************************************
// Preference Activity Methods
@@ -259,7 +259,7 @@
mVoicemailNotificationRingtone.setVoicemailRingtoneNameChangeListener(this);
mVoicemailNotificationRingtone.init(mPhone, mOldVmRingtoneName);
- mVoicemailNotificationVibrate = (CheckBoxPreference) findPreference(
+ mVoicemailNotificationVibrate = (SwitchPreference) findPreference(
getResources().getString(R.string.voicemail_notification_vibrate_key));
mVoicemailNotificationVibrate.setOnPreferenceChangeListener(this);