Revert "Add toggle for Kineto application."

This reverts commit c7cbd9f.

DefyParts/res/values-de/strings.xml

@@ -29,8 +29,4 @@
 
     <string name="other_settings_title">Andere Einstellungen</string>
     <string name="compass_calibrate">Kompasskalibrierung</string>
-    <string name="baseband_switcher">Baseband-Auswahl</string>
-    <string name="kineto_support">Kineto-Unterstützung</string>
-    <string name="kineto_support_summary">Kineto-Anwendung (\'Wifi Calling\') aktivieren</string>
-
 </resources>

DefyParts/res/values/strings.xml

@@ -30,8 +30,6 @@
 
     <string name="other_settings_title">Other settings</string>
     <string name="compass_calibrate">Compass calibrator</string>
-    <string name="baseband_switcher">Baseband selection</string>
-    <string name="kineto_support">Wifi calling support</string>
-    <string name="kineto_support_summary">Enable the T-Mobile Wifi calling application</string>
+    <string name="baseband_switcher">Baseband switcher</string>
 
 </resources>

DefyParts/res/xml/settings.xml

@@ -40,9 +40,7 @@
         </PreferenceScreen>
     </PreferenceCategory>
 
-    <PreferenceCategory android:key="other"
-                        android:title="@string/other_settings_title">
-
+    <PreferenceCategory android:title="@string/other_settings_title">
         <PreferenceScreen android:key="compass_calibrate"
                           android:title="@string/compass_calibrate">
                           <intent
@@ -58,13 +56,6 @@
                              android:targetPackage="com.itfunzbasebandswitcher"
                              android:targetClass="com.itfunzbasebandswitcher.MainActivity" />
         </PreferenceScreen>
-
-        <CheckBoxPreference android:key="kineto"
-                            android:persistent="false"
-                            android:defaultValue="false"
-                            android:title="@string/kineto_support"
-                            android:summary="@string/kineto_support_summary" />
-
     </PreferenceCategory>
 
 </PreferenceScreen>

DefyParts/src/com/cyanogenmod/defyparts/SettingsActivity.java

@@ -3,10 +3,8 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.SystemProperties;
-import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
@@ -22,35 +20,24 @@
 public class SettingsActivity extends PreferenceActivity implements OnPreferenceChangeListener {
     private static final String TAG = "DefyParts";
 
-    private PackageManager mPm;
-
     private PreferenceCategory generalSettings;
     private ListPreference chargeLedModePref;
     private ListPreference touchPointsPref;
-    private CheckBoxPreference kinetoPref;
 
     private static final String PROP_CHARGE_LED_MODE = "persist.sys.charge_led";
     private static final String PROP_TOUCH_POINTS = "persist.sys.multitouch";
-    private static final String PROP_KINETO_ENABLED = "persist.sys.kineto.enable";
     private static final String FILE_TOUCH_POINTS = "/proc/multitouch/num";
-    private static final String KINETO_PACKAGE = "com.android.kineto";
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.settings);
 
-        mPm = getPackageManager();
-
         generalSettings = (PreferenceCategory) getPreferenceScreen().findPreference("general");
         chargeLedModePref = (ListPreference) generalSettings.findPreference("charge_led_mode");
         chargeLedModePref.setOnPreferenceChangeListener(this);
         touchPointsPref = (ListPreference) generalSettings.findPreference("touch_points");
         touchPointsPref.setOnPreferenceChangeListener(this);
-
-        PreferenceCategory otherSettings = (PreferenceCategory) getPreferenceScreen().findPreference("other");
-        kinetoPref = (CheckBoxPreference) otherSettings.findPreference("kineto");
-        kinetoPref.setOnPreferenceChangeListener(this);
     }
 
     @Override
@@ -59,15 +46,6 @@ public void onResume() {
 
         chargeLedModePref.setValue(SystemProperties.get(PROP_CHARGE_LED_MODE));
         touchPointsPref.setValue(SystemProperties.get(PROP_TOUCH_POINTS));
-
-        try {
-            int setting = mPm.getApplicationEnabledSetting(KINETO_PACKAGE);
-            kinetoPref.setEnabled(true);
-            kinetoPref.setChecked(setting == PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
-        } catch (IllegalArgumentException e) {
-            /* kineto not installed for whatever reason */
-            kinetoPref.setEnabled(false);
-        }
     }
 
     @Override
@@ -101,13 +79,6 @@ public void onClick(DialogInterface dialog, int which) {
                 dialog.show();
                 return false;
             }
-        } else if (preference == kinetoPref) {
-            final Boolean value = (Boolean) newValue;
-            final int setting = value ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED :
-                                        PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
-
-            mPm.setApplicationEnabledSetting(KINETO_PACKAGE, setting, 0);
-            SystemProperties.set(PROP_KINETO_ENABLED, value ? "1" : "0");
         }
 
         return true;

kobe-blobs.mk

@@ -29,7 +29,6 @@ PRODUCT_COPY_FILES += \
 	device/motorola/kobe/prebuilt/etc/init.d/03adbd:system/etc/init.d/03adbd \
 	device/motorola/kobe/prebuilt/etc/init.d/05mountsd:system/etc/init.d/05mountsd \
 	device/motorola/kobe/prebuilt/etc/init.d/08backlight:system/etc/init.d/08backlight \
-        device/motorola/jordan/prebuilt/etc/init.d/80kineto:system/etc/init.d/80kineto \
 	device/motorola/kobe/prebuilt/etc/init.d/90multitouch:system/etc/init.d/90multitouch \
 	device/motorola/kobe/prebuilt/etc/profile:system/etc/profile \
 	device/motorola/kobe/prebuilt/etc/sysctl.conf:system/etc/sysctl.conf \