commit 4022b380c75ca183348335133baf5be6678bee77
author Jang Hayeong <hayeong.jang@samsung.com> Tue Jul 16 20:05:17 2019 +0900
committer Sungjae <sung_jae.kim@samsung.com> Wed Mar 18 16:07:53 2020 +0900
tree 0bf32bcf7fe0b84abbf9df7256bff6d7eee90544
parent 43bd1405df1c019be70c0eaa2ff8caca097d2d41

callwaiting: Support CDMA call waiting

Implement the CDMA call waiting setting menu
considering CDMA VoLTE. (UT and CDMA case)
Menu doesn't show status of call waiting if UT is not supported.
So SwitchPreference is not used.
When set call waiting, if call waiting doesn't work over UT,
dial will be triggered.

Bug: 146531989

Change-Id: I805319d93a732a8f24ac7411493259be3b3d3ee6
Signed-off-by: Jang Hayeong <hayeong.jang@samsung.com>
Signed-off-by: Sungjae <sung_jae.kim@samsung.com>

src/com/android/phone/CdmaCallOptions.java

diff --git a/src/com/android/phone/CdmaCallOptions.java b/src/com/android/phone/CdmaCallOptions.java
index a2bc9cb..8f4fa67 100644
--- a/src/com/android/phone/CdmaCallOptions.java
+++ b/src/com/android/phone/CdmaCallOptions.java
@@ -27,12 +27,13 @@
 
 import com.android.internal.telephony.PhoneConstants;
 
-public class CdmaCallOptions extends PreferenceActivity {
+public class CdmaCallOptions extends TimeConsumingPreferenceActivity {
     private static final String LOG_TAG = "CdmaCallOptions";
     private final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
 
     private static final String BUTTON_VP_KEY = "button_voice_privacy_key";
     private static final String CALL_FORWARDING_KEY = "call_forwarding_key";
+    private static final String CALL_WAITING_KEY = "call_waiting_key";
     private SwitchPreference mButtonVoicePrivacy;
 
     @Override
@@ -61,6 +62,10 @@
 
         Preference callForwardingPref = getPreferenceScreen().findPreference(CALL_FORWARDING_KEY);
         callForwardingPref.setIntent(subInfoHelper.getIntent(CdmaCallForwardOptions.class));
+
+        CdmaCallWaitingPreference callWaitingPref = (CdmaCallWaitingPreference)getPreferenceScreen()
+                                                     .findPreference(CALL_WAITING_KEY);
+        callWaitingPref.init(this, subInfoHelper.getPhone());
     }
 
     @Override
@@ -80,5 +85,4 @@
         }
         return false;
     }
-
 }