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