Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0

Conflicts:
	BoardCommonConfig.mk
	camera/Android.mk
	common.mk
	configs/80cfw
	lpm.rc
	overlay/frameworks/base/core/res/res/values/config.xml
	overlay/packages/apps/Camera2/res/values/config.xml

1 files changed, 61 insertions, 0 deletions

diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeMode.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeMode.java
new file mode 100644
index 0000000..c777d72
--- /dev/null
+++ b/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeMode.java
@@ -0,0 +1,61 @@
+/*
+ * 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;
+    }
+
+}