From 19465fa3eb8f9a4047f83cf422a77c3b0c2e19f6 Mon Sep 17 00:00:00 2001
From: Etan Cohen <etancohen@google.com>
Date: Mon, 11 Aug 2014 13:30:14 -0700
Subject: [PATCH] Revert "Radio Information UI for enabling/disabling debug
 settings of MO over VoLTE"

Superseded by "Enhanced 4G LTE Mode" official setting.

This reverts commit 572d25398297049a4da3042d58b1ccecf3514e4d.
---
 res/layout/radio_info.xml               |  8 ------
 res/values/strings.xml                  |  5 ----
 src/com/android/settings/RadioInfo.java | 33 -------------------------
 3 files changed, 46 deletions(-)

diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index 760cf809b5e..d81dad65af8 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -234,14 +234,6 @@
                 android:layout_height="wrap_content"
                 />
 
-        <!-- Dial over PS (i.e. MO VoLTE) -->
-        <Button android:id="@+id/mo_over_volte"
-            android:textSize="14sp"
-            android:layout_marginTop="8dip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            />
-
         <!-- LTE ram dump -->
         <Button android:id="@+id/lte_ram_dump"
                 android:textSize="14sp"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 864d83c5ac5..7905d30acf4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -67,11 +67,6 @@
     <!-- Phone SMS over IMS off. Only shown in diagnostic screen, so precise translation is not needed. -->
     <string name="sms_over_ims_off">Turn off SMS over IMS</string>
 
-    <!-- MO over PS/VoLTE. Only shown in diagnostic screen, so precise translation is not needed. -->
-    <string name="mo_over_volte_on">Enable MO over PS/VoLTE</string>
-    <!-- MO over PS/VoLTE. Only shown in diagnostic screen, so precise translation is not needed. -->
-    <string name="mo_over_volte_off">Disable MO over PS/VoLTE</string>
-
     <!-- Phone SMS over IMS IMS registration required on. Only shown in diagnostic screen, so precise translation is not needed. -->
     <string name="ims_reg_required_on">Turn on IMS registration required</string>
     <!-- Phone IMS registration required off. Only shown in diagnostic screen, so precise translation is not needed. -->
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 75de222442a..b0a4a537ab0 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -303,9 +303,6 @@ public class RadioInfo extends Activity {
         imsRegRequiredButton = (Button) findViewById(R.id.ims_reg_required);
         imsRegRequiredButton.setOnClickListener(mImsRegRequiredHandler);
 
-        moOverVolteButton = (Button) findViewById(R.id.mo_over_volte);
-        moOverVolteButton.setOnClickListener(mMoOverVolteHandler);
-
         smsOverImsButton = (Button) findViewById(R.id.sms_over_ims);
         smsOverImsButton.setOnClickListener(mSmsOverImsHandler);
 
@@ -363,7 +360,6 @@ public class RadioInfo extends Activity {
         updatePowerState();
         updateCellInfoListRate();
         updateImsRegRequiredState();
-        updateMoOverImsState();
         updateSmsOverImsState();
         updateLteRamDumpState();
         updateProperties();
@@ -989,35 +985,6 @@ public class RadioInfo extends Activity {
         imsRegRequiredButton.setText(buttonText);
     }
 
-    private Button moOverVolteButton;
-    OnClickListener mMoOverVolteHandler = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            boolean moOverVolteEnabled = isMoOverVolteEnabled();
-            log(String.format("toggle %s: currently %s",
-                    TelephonyProperties.PROPERTY_DBG_IMS_VOLTE_ENABLE,
-                    (moOverVolteEnabled ? "on" : "off")));
-            boolean newValue = !moOverVolteEnabled;
-            SystemProperties.set(TelephonyProperties.PROPERTY_DBG_IMS_VOLTE_ENABLE,
-                    newValue ? "1" : "0");
-            updateMoOverImsState();
-        }
-    };
-
-    private boolean isMoOverVolteEnabled() {
-        return SystemProperties.getInt(TelephonyProperties.PROPERTY_DBG_IMS_VOLTE_ENABLE,
-                TelephonyProperties.PROPERTY_DBG_IMS_VOLTE_ENABLE_DEAFULT) == 1;
-    }
-
-    private void updateMoOverImsState() {
-        boolean moOverVolteEnabled = isMoOverVolteEnabled();
-        log("updateMoOverImsState isMoOverVolteEnabled()=" + moOverVolteEnabled);
-        String buttonText = moOverVolteEnabled ?
-                getString(R.string.mo_over_volte_off) :
-                getString(R.string.mo_over_volte_on);
-        moOverVolteButton.setText(buttonText);
-    }
-
     private Button smsOverImsButton;
     static final String PROPERTY_SMS_OVER_IMS = "persist.radio.imsallowmtsms";
     OnClickListener mSmsOverImsHandler = new OnClickListener() {