cmhw: Add DisplayModeControl support

Make use of LiveDisplay's implementation of display modes.

Remove AdvancedDisplay's display mode support as it duplicates
functionality provided by the CMHW implementation.

Based on Sean hoyt's original work on klmintwifi.

Change-Id: I455a8c764118adbdb997b2ba9145e24fecb8199b

4 files changed, 0 insertions, 67 deletions

diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/DisplaySettings.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/DisplaySettings.java
index e5930c8..147fe5e 100644
--- a/AdvancedDisplay/src/com/cyanogenmod/settings/device/DisplaySettings.java
+++ b/AdvancedDisplay/src/com/cyanogenmod/settings/device/DisplaySettings.java
@@ -35,7 +35,6 @@ public class DisplaySettings extends Activity {
     public static final String SHARED_PREFERENCES_BASENAME = "com.cyanogenmod.settings.device";
     public static final String ACTION_UPDATE_PREFERENCES = "com.cyanogenmod.settings.device.UPDATE";
     public static final String KEY_MDNIE_SCENARIO = "mdnie_scenario";
-    public static final String KEY_MDNIE_MODE = "mdnie_mode";
     public static final String KEY_MDNIE_NEGATIVE = "mdnie_negative";
 
     ScreenFragmentActivity mFragment;
diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java
index 8ecb593..7a99daf 100644
--- a/AdvancedDisplay/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java
+++ b/AdvancedDisplay/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java
@@ -38,7 +38,6 @@ public class ScreenFragmentActivity extends PreferenceFragment {
     private static final String PREF_ENABLED = "1";
     private static final String TAG = "DisplaySettings_Screen";
     private mDNIeScenario mmDNIeScenario;
-    private mDNIeMode mmDNIeMode;
     private mDNIeNegative mmDNIeNegative;
 
     @Override
@@ -53,9 +52,6 @@ public class ScreenFragmentActivity extends PreferenceFragment {
         mmDNIeScenario = (mDNIeScenario) findPreference(DisplaySettings.KEY_MDNIE_SCENARIO);
         mmDNIeScenario.setEnabled(mDNIeScenario.isSupported(res.getString(R.string.mdnie_scenario_sysfs_file)));
 
-        mmDNIeMode = (mDNIeMode) findPreference(DisplaySettings.KEY_MDNIE_MODE);
-        mmDNIeMode.setEnabled(mDNIeMode.isSupported(res.getString(R.string.mdnie_mode_sysfs_file)));
-
         mmDNIeNegative = (mDNIeNegative) findPreference(DisplaySettings.KEY_MDNIE_NEGATIVE);
         mmDNIeNegative.setEnabled(mDNIeNegative.isSupported(res.getString(R.string.mdnie_negative_sysfs_file)));
 
diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/Startup.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/Startup.java
index 2bada88..ba7c2c5 100644
--- a/AdvancedDisplay/src/com/cyanogenmod/settings/device/Startup.java
+++ b/AdvancedDisplay/src/com/cyanogenmod/settings/device/Startup.java
@@ -25,7 +25,6 @@ public class Startup extends BroadcastReceiver {
     @Override
     public void onReceive(final Context context, final Intent bootintent) {
         mDNIeScenario.restore(context);
-        mDNIeMode.restore(context);
         mDNIeNegative.restore(context);
         ScreenFragmentActivity.restore(context);
     }
diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeMode.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeMode.java
deleted file mode 100644
index c777d72..0000000
--- a/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeMode.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2012 The CyanogenMod Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.cyanogenmod.settings.device;
-
-import android.content.Context;
-
-import android.content.SharedPreferences;
-import android.util.AttributeSet;
-import android.preference.Preference;
-import android.preference.ListPreference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.PreferenceManager;
-
-public class mDNIeMode extends ListPreference implements OnPreferenceChangeListener {
-
-    private static String FILE = null;
-
-    public mDNIeMode(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        this.setOnPreferenceChangeListener(this);
-        FILE = context.getResources().getString(R.string.mdnie_mode_sysfs_file);
-    }
-
-    public static boolean isSupported(String filePath) {
-        return Utils.fileExists(filePath);
-    }
-
-    /**
-     * Restore mdnie user mode setting from SharedPreferences. (Write to kernel.)
-     * @param context       The context to read the SharedPreferences from
-     */
-    public static void restore(Context context) {
-        FILE = context.getResources().getString(R.string.mdnie_mode_sysfs_file);
-        if (!isSupported(FILE)) {
-            return;
-        }
-
-        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
-        Utils.writeValue(FILE, sharedPrefs.getString(DisplaySettings.KEY_MDNIE_MODE, "0"));
-    }
-
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        Utils.writeValue(FILE, (String) newValue);
-        return true;
-    }
-
-}