From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Thu, 30 Jun 2016 10:47:22 +0000 (+0800)
Subject: cmhw: Add DisplayModeControl support
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8a137404775c2094dea78a1edb312a5fa20a3d24;p=GitHub%2FLineageOS%2Fandroid_hardware_samsung.git

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
---

diff --git a/AdvancedDisplay/res/values-af/arrays.xml b/AdvancedDisplay/res/values-af/arrays.xml
index 6fb8c47..986e437 100644
--- a/AdvancedDisplay/res/values-af/arrays.xml
+++ b/AdvancedDisplay/res/values-af/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galery</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinamies (standaard)</item>
-    <item>Standaard</item>
-    <item>Natuurlik</item>
-    <item>Flieks</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normaal</item>
     <item>Omgekeerde</item>
diff --git a/AdvancedDisplay/res/values-af/strings.xml b/AdvancedDisplay/res/values-af/strings.xml
index 31e2995..7f4dac9 100644
--- a/AdvancedDisplay/res/values-af/strings.xml
+++ b/AdvancedDisplay/res/values-af/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Scenario</string>
   <string name="mdnie_scenario_summary_head">Stel die mDNIe scenario</string>
-  <string name="mdnie_mode_title_head">Modus</string>
-  <string name="mdnie_mode_summary_head">Stel die mDNIe modus</string>
   <string name="mdnie_negative_title_head">Negatiewe modus</string>
   <string name="mdnie_negative_summary_head">Aktiveer/deaktiveer omgekeerde kleure</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ar/arrays.xml b/AdvancedDisplay/res/values-ar/arrays.xml
index 1c7150c..37772ea 100644
--- a/AdvancedDisplay/res/values-ar/arrays.xml
+++ b/AdvancedDisplay/res/values-ar/arrays.xml
@@ -27,12 +27,6 @@
     <item>معرض</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>ديناميكي (افتراضي)</item>
-    <item>قياسي</item>
-    <item>طبيعي</item>
-    <item>فيلم</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>عادي</item>
     <item>معكوس</item>
diff --git a/AdvancedDisplay/res/values-ar/strings.xml b/AdvancedDisplay/res/values-ar/strings.xml
index e7b4186..6f69849 100644
--- a/AdvancedDisplay/res/values-ar/strings.xml
+++ b/AdvancedDisplay/res/values-ar/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">السيناريو</string>
   <string name="mdnie_scenario_summary_head">تعيين السيناريو mDNIe</string>
-  <string name="mdnie_mode_title_head">نمط</string>
-  <string name="mdnie_mode_summary_head">تعيين وضع mDNIe</string>
   <string name="mdnie_negative_title_head">وضع سلبي</string>
   <string name="mdnie_negative_summary_head">تمكين/تعطيل ألوان معكوسة</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-as-rIN/arrays.xml b/AdvancedDisplay/res/values-as-rIN/arrays.xml
index 404bbb4..a6b30f1 100644
--- a/AdvancedDisplay/res/values-as-rIN/arrays.xml
+++ b/AdvancedDisplay/res/values-as-rIN/arrays.xml
@@ -27,12 +27,6 @@
     <item>গেলাৰী</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>ডায়নামিক (ডিফ\'ল্ট)</item>
-    <item>ষ্টেণ্ডাৰ্ড</item>
-    <item>প্ৰাকৃতিক</item>
-    <item>চলচ্চিত্ৰ্ৰ</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>সাধাৰণ</item>
     <item>বিপৰীত</item>
diff --git a/AdvancedDisplay/res/values-as-rIN/strings.xml b/AdvancedDisplay/res/values-as-rIN/strings.xml
index 7f722aa..d0b9b15 100644
--- a/AdvancedDisplay/res/values-as-rIN/strings.xml
+++ b/AdvancedDisplay/res/values-as-rIN/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">দৃশ্যপট</string>
   <string name="mdnie_scenario_summary_head">mDNIe দৃশ্যপট ছেট কৰক</string>
-  <string name="mdnie_mode_title_head">মোড</string>
-  <string name="mdnie_mode_summary_head">mDNIe মোড ছেট কৰক</string>
   <string name="mdnie_negative_title_head">নেগেটিভ মোড</string>
   <string name="mdnie_negative_summary_head">বিপৰীত ৰংবোৰ সক্ষম/অক্ষম কৰক</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ast-rES/arrays.xml b/AdvancedDisplay/res/values-ast-rES/arrays.xml
index 1535257..f2b4685 100644
--- a/AdvancedDisplay/res/values-ast-rES/arrays.xml
+++ b/AdvancedDisplay/res/values-ast-rES/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galería</item>
     <item>Videollamada</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinámicu (por defeutu)</item>
-    <item>Estándar</item>
-    <item>Natural</item>
-    <item>Película</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Invertíu</item>
diff --git a/AdvancedDisplay/res/values-ast-rES/strings.xml b/AdvancedDisplay/res/values-ast-rES/strings.xml
index 2d0e991..431285c 100644
--- a/AdvancedDisplay/res/values-ast-rES/strings.xml
+++ b/AdvancedDisplay/res/values-ast-rES/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Escenariu</string>
   <string name="mdnie_scenario_summary_head">Definir l\'escenariu mDNIe</string>
-  <string name="mdnie_mode_title_head">Mou</string>
-  <string name="mdnie_mode_summary_head">Definir el mou mDNIe</string>
   <string name="mdnie_negative_title_head">Mou negativu</string>
   <string name="mdnie_negative_summary_head">Activar/desactivar los colores invertíos</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-az-rAZ/arrays.xml b/AdvancedDisplay/res/values-az-rAZ/arrays.xml
index 7c3408e..322119c 100644
--- a/AdvancedDisplay/res/values-az-rAZ/arrays.xml
+++ b/AdvancedDisplay/res/values-az-rAZ/arrays.xml
@@ -27,12 +27,6 @@
     <item>Qalereya</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinamik (ilkin)</item>
-    <item>Standard</item>
-    <item>Tәbii</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Tərsinə çevrilmiş</item>
diff --git a/AdvancedDisplay/res/values-az-rAZ/strings.xml b/AdvancedDisplay/res/values-az-rAZ/strings.xml
index 233035a..5a32a8a 100644
--- a/AdvancedDisplay/res/values-az-rAZ/strings.xml
+++ b/AdvancedDisplay/res/values-az-rAZ/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Ekran rejimi</string>
   <string name="mdnie_scenario_summary_head">mDNle ssenarisini tənzimlə</string>
-  <string name="mdnie_mode_title_head">Rejim</string>
-  <string name="mdnie_mode_summary_head">mDNle rejimini tənzimlə</string>
   <string name="mdnie_negative_title_head">Neqativ rejim</string>
   <string name="mdnie_negative_summary_head">Tərs rәnglәri aç/bağla</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-be/arrays.xml b/AdvancedDisplay/res/values-be/arrays.xml
index 38151e0..0df9697 100644
--- a/AdvancedDisplay/res/values-be/arrays.xml
+++ b/AdvancedDisplay/res/values-be/arrays.xml
@@ -27,12 +27,6 @@
     <item>Галерэя</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Дынамічны (Па змаўчанні)</item>
-    <item>Стандартны</item>
-    <item>Натуральны</item>
-    <item>Фільм</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Звычайны</item>
     <item>Інверсія</item>
diff --git a/AdvancedDisplay/res/values-be/strings.xml b/AdvancedDisplay/res/values-be/strings.xml
index b4b0324..a8401ae 100644
--- a/AdvancedDisplay/res/values-be/strings.xml
+++ b/AdvancedDisplay/res/values-be/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Сцэнар</string>
   <string name="mdnie_scenario_summary_head">Усталёўка сцэнара mDNIe</string>
-  <string name="mdnie_mode_title_head">Рэжым</string>
-  <string name="mdnie_mode_summary_head">Усталёўка рэжыму mDNIe</string>
   <string name="mdnie_negative_title_head">Негатыў</string>
   <string name="mdnie_negative_summary_head">Укл./выкл. інверсіі колераў</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-bg/arrays.xml b/AdvancedDisplay/res/values-bg/arrays.xml
index 1850499..adc51e0 100644
--- a/AdvancedDisplay/res/values-bg/arrays.xml
+++ b/AdvancedDisplay/res/values-bg/arrays.xml
@@ -27,12 +27,6 @@
     <item>Галерия</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Динамичен (по подразбиране)</item>
-    <item>Стандартен</item>
-    <item>Естествен</item>
-    <item>Филм</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Нормално</item>
     <item>Обърнати</item>
diff --git a/AdvancedDisplay/res/values-bg/strings.xml b/AdvancedDisplay/res/values-bg/strings.xml
index eb3859f..7efb116 100644
--- a/AdvancedDisplay/res/values-bg/strings.xml
+++ b/AdvancedDisplay/res/values-bg/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Сценарий</string>
   <string name="mdnie_scenario_summary_head">Избор на сценария mDNIe</string>
-  <string name="mdnie_mode_title_head">Режим</string>
-  <string name="mdnie_mode_summary_head">Посочете режим mDNIe</string>
   <string name="mdnie_negative_title_head">Негативен режим</string>
   <string name="mdnie_negative_summary_head">Включи/изключи инверсия на цветовете</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ca/arrays.xml b/AdvancedDisplay/res/values-ca/arrays.xml
index 696a52d..7489c26 100644
--- a/AdvancedDisplay/res/values-ca/arrays.xml
+++ b/AdvancedDisplay/res/values-ca/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galeria</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinàmic (per defecte)</item>
-    <item>Estàndard</item>
-    <item>Natural</item>
-    <item>Cinema</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Invertit</item>
diff --git a/AdvancedDisplay/res/values-ca/strings.xml b/AdvancedDisplay/res/values-ca/strings.xml
index 68fb11b..7bca716 100644
--- a/AdvancedDisplay/res/values-ca/strings.xml
+++ b/AdvancedDisplay/res/values-ca/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Escenari</string>
   <string name="mdnie_scenario_summary_head">Estableix l\'escenari de mDNIe</string>
-  <string name="mdnie_mode_title_head">Mode</string>
-  <string name="mdnie_mode_summary_head">Estableix el mode de mDNIe</string>
   <string name="mdnie_negative_title_head">Mode negatiu</string>
   <string name="mdnie_negative_summary_head">Habilita/inhabilita els colors invertits</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-cs/arrays.xml b/AdvancedDisplay/res/values-cs/arrays.xml
index ffd1679..3d50b8d 100644
--- a/AdvancedDisplay/res/values-cs/arrays.xml
+++ b/AdvancedDisplay/res/values-cs/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galerie</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dynamický (výchozí)</item>
-    <item>Standardní</item>
-    <item>Přirozený</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normální</item>
     <item>Inverzní</item>
diff --git a/AdvancedDisplay/res/values-cs/strings.xml b/AdvancedDisplay/res/values-cs/strings.xml
index 972d087..9247c50 100644
--- a/AdvancedDisplay/res/values-cs/strings.xml
+++ b/AdvancedDisplay/res/values-cs/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Scénář</string>
   <string name="mdnie_scenario_summary_head">Nastavit scénář pro mDNIe</string>
-  <string name="mdnie_mode_title_head">Režim</string>
-  <string name="mdnie_mode_summary_head">Nastavit režim mDNIe</string>
   <string name="mdnie_negative_title_head">Inverzní režim</string>
   <string name="mdnie_negative_summary_head">Použít invertování barev</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-da/arrays.xml b/AdvancedDisplay/res/values-da/arrays.xml
index 6a0bd64..5b2cd18 100644
--- a/AdvancedDisplay/res/values-da/arrays.xml
+++ b/AdvancedDisplay/res/values-da/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galleri</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dynamisk (standard)</item>
-    <item>Standard</item>
-    <item>Naturlig</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Inverteret</item>
diff --git a/AdvancedDisplay/res/values-da/strings.xml b/AdvancedDisplay/res/values-da/strings.xml
index 3295e86..1b66f58 100644
--- a/AdvancedDisplay/res/values-da/strings.xml
+++ b/AdvancedDisplay/res/values-da/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Scenarie</string>
   <string name="mdnie_scenario_summary_head">Angiv mDNIe-scenariet</string>
-  <string name="mdnie_mode_title_head">Tilstand</string>
-  <string name="mdnie_mode_summary_head">Angiv mDNIe-tilstanden</string>
   <string name="mdnie_negative_title_head">Negativ tilstand</string>
   <string name="mdnie_negative_summary_head">Aktivér/deaktivér inverteret farver</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-de/arrays.xml b/AdvancedDisplay/res/values-de/arrays.xml
index 9f1354b..3b54c86 100644
--- a/AdvancedDisplay/res/values-de/arrays.xml
+++ b/AdvancedDisplay/res/values-de/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galerie</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dynamisch (Standard)</item>
-    <item>Normal</item>
-    <item>Natürlich</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Invertiert</item>
diff --git a/AdvancedDisplay/res/values-de/strings.xml b/AdvancedDisplay/res/values-de/strings.xml
index ea1ce37..70bdb41 100644
--- a/AdvancedDisplay/res/values-de/strings.xml
+++ b/AdvancedDisplay/res/values-de/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Szenario</string>
   <string name="mdnie_scenario_summary_head">Wählen Sie das mDNIe-Szenario</string>
-  <string name="mdnie_mode_title_head">Modus</string>
-  <string name="mdnie_mode_summary_head">Wählen Sie den mDNIe-Modus</string>
   <string name="mdnie_negative_title_head">Negativmodus</string>
   <string name="mdnie_negative_summary_head">Invertierte Farben ein-/ausschalten</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-el/arrays.xml b/AdvancedDisplay/res/values-el/arrays.xml
index 307a421..e170ee6 100644
--- a/AdvancedDisplay/res/values-el/arrays.xml
+++ b/AdvancedDisplay/res/values-el/arrays.xml
@@ -27,12 +27,6 @@
     <item>Συλλογή</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Δυναμική (προεπιλογή)</item>
-    <item>Κανονική</item>
-    <item>Φυσική</item>
-    <item>Ταινία</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Κανονική</item>
     <item>Ανεστραμμένη</item>
diff --git a/AdvancedDisplay/res/values-el/strings.xml b/AdvancedDisplay/res/values-el/strings.xml
index f26849b..37c4c74 100644
--- a/AdvancedDisplay/res/values-el/strings.xml
+++ b/AdvancedDisplay/res/values-el/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Σενάριο</string>
   <string name="mdnie_scenario_summary_head">Ορίστε το σενάριο mDNIe</string>
-  <string name="mdnie_mode_title_head">Λειτουργία</string>
-  <string name="mdnie_mode_summary_head">Ορίστε την λειτουργία mDNIe</string>
   <string name="mdnie_negative_title_head">Αρνητική λειτουργία</string>
   <string name="mdnie_negative_summary_head">Ενεργοποίηση/απενεργοποίηση αντεστραμμένων χρωμάτων</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-en-rIN/arrays.xml b/AdvancedDisplay/res/values-en-rIN/arrays.xml
index 7385020..a3d4207 100644
--- a/AdvancedDisplay/res/values-en-rIN/arrays.xml
+++ b/AdvancedDisplay/res/values-en-rIN/arrays.xml
@@ -27,12 +27,6 @@
     <item>Gallery</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dynamic (default)</item>
-    <item>Standard</item>
-    <item>Natural</item>
-    <item>Movie</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Inverted</item>
diff --git a/AdvancedDisplay/res/values-en-rIN/strings.xml b/AdvancedDisplay/res/values-en-rIN/strings.xml
index 8b25c90..6e98711 100644
--- a/AdvancedDisplay/res/values-en-rIN/strings.xml
+++ b/AdvancedDisplay/res/values-en-rIN/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Scenario</string>
   <string name="mdnie_scenario_summary_head">Set the mDNIe scenario</string>
-  <string name="mdnie_mode_title_head">Mode</string>
-  <string name="mdnie_mode_summary_head">Set the mDNIe mode</string>
   <string name="mdnie_negative_title_head">Negative mode</string>
   <string name="mdnie_negative_summary_head">Enable/disable inverted colours</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-es-rUS/arrays.xml b/AdvancedDisplay/res/values-es-rUS/arrays.xml
index 0e8ea50..958d6fc 100644
--- a/AdvancedDisplay/res/values-es-rUS/arrays.xml
+++ b/AdvancedDisplay/res/values-es-rUS/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galería</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinámico (predeterminado)</item>
-    <item>Estándar</item>
-    <item>Natural</item>
-    <item>Películas</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Invertido</item>
diff --git a/AdvancedDisplay/res/values-es-rUS/strings.xml b/AdvancedDisplay/res/values-es-rUS/strings.xml
index 7ef53a8..9afda3b 100644
--- a/AdvancedDisplay/res/values-es-rUS/strings.xml
+++ b/AdvancedDisplay/res/values-es-rUS/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Escenario</string>
   <string name="mdnie_scenario_summary_head">Establecer escenario mDNIe</string>
-  <string name="mdnie_mode_title_head">Modo</string>
-  <string name="mdnie_mode_summary_head">Establecer modo mDNIe</string>
   <string name="mdnie_negative_title_head">Modo negativo</string>
   <string name="mdnie_negative_summary_head">Activar/desactivar colores invertidos</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-es/arrays.xml b/AdvancedDisplay/res/values-es/arrays.xml
index ae186a4..a3021b6 100644
--- a/AdvancedDisplay/res/values-es/arrays.xml
+++ b/AdvancedDisplay/res/values-es/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galería</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinámico (por defecto)</item>
-    <item>Estándar</item>
-    <item>Natural</item>
-    <item>Película</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Invertido</item>
diff --git a/AdvancedDisplay/res/values-es/strings.xml b/AdvancedDisplay/res/values-es/strings.xml
index 072bb6e..402d6f5 100644
--- a/AdvancedDisplay/res/values-es/strings.xml
+++ b/AdvancedDisplay/res/values-es/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Escenario</string>
   <string name="mdnie_scenario_summary_head">Establecer el escenario mDNIe</string>
-  <string name="mdnie_mode_title_head">Modo</string>
-  <string name="mdnie_mode_summary_head">Establecer el modo de mDNIe</string>
   <string name="mdnie_negative_title_head">Modo negativo</string>
   <string name="mdnie_negative_summary_head">Activar/desactivar colores invertidos</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-et-rEE/arrays.xml b/AdvancedDisplay/res/values-et-rEE/arrays.xml
index 46f34b2..57053af 100644
--- a/AdvancedDisplay/res/values-et-rEE/arrays.xml
+++ b/AdvancedDisplay/res/values-et-rEE/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galerii</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dünaamiline (vaikimisi)</item>
-    <item>Standard</item>
-    <item>Looduslik</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normaalne</item>
     <item>Negatiivne</item>
diff --git a/AdvancedDisplay/res/values-et-rEE/strings.xml b/AdvancedDisplay/res/values-et-rEE/strings.xml
index e9d113c..0601646 100644
--- a/AdvancedDisplay/res/values-et-rEE/strings.xml
+++ b/AdvancedDisplay/res/values-et-rEE/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Stsenaarium</string>
   <string name="mdnie_scenario_summary_head">Seadke mDNIe stsenaarium</string>
-  <string name="mdnie_mode_title_head">Režiim</string>
-  <string name="mdnie_mode_summary_head">Seadke mDNIe režiim</string>
   <string name="mdnie_negative_title_head">Negatiivne režiim</string>
   <string name="mdnie_negative_summary_head">Luba/keela negatiivsed värvid</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-eu-rES/arrays.xml b/AdvancedDisplay/res/values-eu-rES/arrays.xml
index 8a215d2..6163281 100644
--- a/AdvancedDisplay/res/values-eu-rES/arrays.xml
+++ b/AdvancedDisplay/res/values-eu-rES/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galeria</item>
     <item>Bideodeia</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinamikoa (lehenetsia)</item>
-    <item>Estandarra</item>
-    <item>Naturala</item>
-    <item>Filmea</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Arrunta</item>
     <item>Alderantzikatua</item>
diff --git a/AdvancedDisplay/res/values-eu-rES/strings.xml b/AdvancedDisplay/res/values-eu-rES/strings.xml
index dd197d2..ea6b21d 100644
--- a/AdvancedDisplay/res/values-eu-rES/strings.xml
+++ b/AdvancedDisplay/res/values-eu-rES/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Eszenatokia</string>
   <string name="mdnie_scenario_summary_head">mDNIe eszenatokia ezarri</string>
-  <string name="mdnie_mode_title_head">Modua</string>
-  <string name="mdnie_mode_summary_head">Ezarri mDNIe modua</string>
   <string name="mdnie_negative_title_head">Modu negatiboa</string>
   <string name="mdnie_negative_summary_head">Gaitu/ezgaitu kolore alderantzikatuak</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-fa/arrays.xml b/AdvancedDisplay/res/values-fa/arrays.xml
index e1fd9a3..3a178a6 100644
--- a/AdvancedDisplay/res/values-fa/arrays.xml
+++ b/AdvancedDisplay/res/values-fa/arrays.xml
@@ -27,12 +27,6 @@
     <item>گالری</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>پویا (پیش‌فرض)</item>
-    <item>استاندارد</item>
-    <item>طبیعی</item>
-    <item>فیلم</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>عادی</item>
     <item>معکوس</item>
diff --git a/AdvancedDisplay/res/values-fa/strings.xml b/AdvancedDisplay/res/values-fa/strings.xml
index 92e795e..51df1dd 100644
--- a/AdvancedDisplay/res/values-fa/strings.xml
+++ b/AdvancedDisplay/res/values-fa/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">خط مشی</string>
   <string name="mdnie_scenario_summary_head">تنظیم خط مشی mDNIe</string>
-  <string name="mdnie_mode_title_head">حالت</string>
-  <string name="mdnie_mode_summary_head">تنظیم حالت mDNIe</string>
   <string name="mdnie_negative_title_head">حالت معکوس رنگ‌ها</string>
   <string name="mdnie_negative_summary_head">فعال/غیرفعال کردن رنگ‌های معکوس</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-fi/arrays.xml b/AdvancedDisplay/res/values-fi/arrays.xml
index e7b806d..d2d7701 100644
--- a/AdvancedDisplay/res/values-fi/arrays.xml
+++ b/AdvancedDisplay/res/values-fi/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galleria</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dynaaminen (oletus)</item>
-    <item>Standardi</item>
-    <item>Luonnollinen</item>
-    <item>Elokuva</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normaali</item>
     <item>Käänteinen</item>
diff --git a/AdvancedDisplay/res/values-fi/strings.xml b/AdvancedDisplay/res/values-fi/strings.xml
index 3b3f1be..1d1f4bb 100644
--- a/AdvancedDisplay/res/values-fi/strings.xml
+++ b/AdvancedDisplay/res/values-fi/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Skenaario</string>
   <string name="mdnie_scenario_summary_head">Aseta mDNIe-skenaario</string>
-  <string name="mdnie_mode_title_head">Tila</string>
-  <string name="mdnie_mode_summary_head">Aseta mDNIe-tila</string>
   <string name="mdnie_negative_title_head">Negatiivitila</string>
   <string name="mdnie_negative_summary_head">Käytä käänteisiä värejä</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-fr/arrays.xml b/AdvancedDisplay/res/values-fr/arrays.xml
index 69ec602..3d7a75f 100644
--- a/AdvancedDisplay/res/values-fr/arrays.xml
+++ b/AdvancedDisplay/res/values-fr/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galerie</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dynamique (par défaut)</item>
-    <item>Standard</item>
-    <item>Naturel</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Inversé</item>
diff --git a/AdvancedDisplay/res/values-fr/strings.xml b/AdvancedDisplay/res/values-fr/strings.xml
index 6790d4e..9b9bca8 100644
--- a/AdvancedDisplay/res/values-fr/strings.xml
+++ b/AdvancedDisplay/res/values-fr/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Scénario</string>
   <string name="mdnie_scenario_summary_head">Définir le scénario mDNIe</string>
-  <string name="mdnie_mode_title_head">Mode</string>
-  <string name="mdnie_mode_summary_head">Définir le mode mDNIe</string>
   <string name="mdnie_negative_title_head">Mode négatif</string>
   <string name="mdnie_negative_summary_head">Activer/désactiver les couleurs inversées</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-gl-rES/arrays.xml b/AdvancedDisplay/res/values-gl-rES/arrays.xml
index d8bf3f2..d6c7d5c 100644
--- a/AdvancedDisplay/res/values-gl-rES/arrays.xml
+++ b/AdvancedDisplay/res/values-gl-rES/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galería</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinámico (predeterminado)</item>
-    <item>Estándar</item>
-    <item>Natural</item>
-    <item>Película</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Invertido</item>
diff --git a/AdvancedDisplay/res/values-gl-rES/strings.xml b/AdvancedDisplay/res/values-gl-rES/strings.xml
index 9eb3c9b..592ab46 100644
--- a/AdvancedDisplay/res/values-gl-rES/strings.xml
+++ b/AdvancedDisplay/res/values-gl-rES/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Escenario</string>
   <string name="mdnie_scenario_summary_head">Estabelecer o escenario mDNIe</string>
-  <string name="mdnie_mode_title_head">Modo</string>
-  <string name="mdnie_mode_summary_head">Estabelecer o modo mDNIe</string>
   <string name="mdnie_negative_title_head">Modo negativo</string>
   <string name="mdnie_negative_summary_head">Activar/desactivar cores invertidas</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-gu-rIN/arrays.xml b/AdvancedDisplay/res/values-gu-rIN/arrays.xml
index 81c92d7..520239d 100644
--- a/AdvancedDisplay/res/values-gu-rIN/arrays.xml
+++ b/AdvancedDisplay/res/values-gu-rIN/arrays.xml
@@ -27,12 +27,6 @@
     <item>ગેલેરી</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>ડાયનેમિક (ડિફૉલ્ટ)</item>
-    <item>પ્રમાણભૂત</item>
-    <item>નેચરલ</item>
-    <item>ફિલ્મ</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>સામાન્ય</item>
     <item>ઉલટાવેલ</item>
diff --git a/AdvancedDisplay/res/values-gu-rIN/strings.xml b/AdvancedDisplay/res/values-gu-rIN/strings.xml
index a709666..47e405d 100644
--- a/AdvancedDisplay/res/values-gu-rIN/strings.xml
+++ b/AdvancedDisplay/res/values-gu-rIN/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">દ્રશ્ય</string>
   <string name="mdnie_scenario_summary_head">mDNIe દ્રશ્ય સેટ કરો</string>
-  <string name="mdnie_mode_title_head">મોડ</string>
-  <string name="mdnie_mode_summary_head">mDNIe મોડ સેટ કરો</string>
   <string name="mdnie_negative_title_head">નૅવિગેશન મોડ</string>
   <string name="mdnie_negative_summary_head">વિપરીત રંગો સક્ષમ/અક્ષમ કરો</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-hr/arrays.xml b/AdvancedDisplay/res/values-hr/arrays.xml
index 0434a33..1c4370a 100644
--- a/AdvancedDisplay/res/values-hr/arrays.xml
+++ b/AdvancedDisplay/res/values-hr/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galerija</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinamično (zadano)</item>
-    <item>Standardno</item>
-    <item>Prirodno</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normalan</item>
     <item>Preokrenuto</item>
diff --git a/AdvancedDisplay/res/values-hr/strings.xml b/AdvancedDisplay/res/values-hr/strings.xml
index 370e098..0514418 100644
--- a/AdvancedDisplay/res/values-hr/strings.xml
+++ b/AdvancedDisplay/res/values-hr/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Scenarij</string>
   <string name="mdnie_scenario_summary_head">Podesite mDNIe scenarij</string>
-  <string name="mdnie_mode_title_head">Način</string>
-  <string name="mdnie_mode_summary_head">Postavite mDNIe način</string>
   <string name="mdnie_negative_title_head">Negativni način</string>
   <string name="mdnie_negative_summary_head">Uključite/isključite obrnute boje</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-hu/arrays.xml b/AdvancedDisplay/res/values-hu/arrays.xml
index 34131f9..9531908 100644
--- a/AdvancedDisplay/res/values-hu/arrays.xml
+++ b/AdvancedDisplay/res/values-hu/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galéria</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinamikus (alapbeállítás)</item>
-    <item>Hagyományos</item>
-    <item>Természetes</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normál</item>
     <item>Fordított</item>
diff --git a/AdvancedDisplay/res/values-hu/strings.xml b/AdvancedDisplay/res/values-hu/strings.xml
index b6b5f51..65fd842 100644
--- a/AdvancedDisplay/res/values-hu/strings.xml
+++ b/AdvancedDisplay/res/values-hu/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Megjelenítés</string>
   <string name="mdnie_scenario_summary_head">mDNIe megjelenítési beállítások</string>
-  <string name="mdnie_mode_title_head">Üzemmód</string>
-  <string name="mdnie_mode_summary_head">mDNIe üzemmódok</string>
   <string name="mdnie_negative_title_head">Negatív üzemmód</string>
   <string name="mdnie_negative_summary_head">Fordított színek ki/be</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-in/arrays.xml b/AdvancedDisplay/res/values-in/arrays.xml
index f74f89a..554c36c 100644
--- a/AdvancedDisplay/res/values-in/arrays.xml
+++ b/AdvancedDisplay/res/values-in/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galeri</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinamis (baku)</item>
-    <item>Standar</item>
-    <item>Natural</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Terbalik</item>
diff --git a/AdvancedDisplay/res/values-in/strings.xml b/AdvancedDisplay/res/values-in/strings.xml
index 4ab62ad..ae0ab8a 100644
--- a/AdvancedDisplay/res/values-in/strings.xml
+++ b/AdvancedDisplay/res/values-in/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Skenario</string>
   <string name="mdnie_scenario_summary_head">Setel skenario mDNIe</string>
-  <string name="mdnie_mode_title_head">Modus</string>
-  <string name="mdnie_mode_summary_head">Setel modus mDNIe</string>
   <string name="mdnie_negative_title_head">Modus negatif</string>
   <string name="mdnie_negative_summary_head">Aktifkan/nonaktifkan warna terbalik</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-it/arrays.xml b/AdvancedDisplay/res/values-it/arrays.xml
index e7ac3a0..cb7e82d 100644
--- a/AdvancedDisplay/res/values-it/arrays.xml
+++ b/AdvancedDisplay/res/values-it/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galleria</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinamico (predefinito)</item>
-    <item>Standard</item>
-    <item>Naturale</item>
-    <item>Video</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normale</item>
     <item>Invertito</item>
diff --git a/AdvancedDisplay/res/values-it/strings.xml b/AdvancedDisplay/res/values-it/strings.xml
index 499a65f..1f3325b 100644
--- a/AdvancedDisplay/res/values-it/strings.xml
+++ b/AdvancedDisplay/res/values-it/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Scenario</string>
   <string name="mdnie_scenario_summary_head">Imposta scenario mDNle</string>
-  <string name="mdnie_mode_title_head">Modalità</string>
-  <string name="mdnie_mode_summary_head">Imposta modalità mDNIe</string>
   <string name="mdnie_negative_title_head">Modalità negativo</string>
   <string name="mdnie_negative_summary_head">Attiva/Disattiva colori invertiti</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-iw/arrays.xml b/AdvancedDisplay/res/values-iw/arrays.xml
index 4559aed..7867f03 100644
--- a/AdvancedDisplay/res/values-iw/arrays.xml
+++ b/AdvancedDisplay/res/values-iw/arrays.xml
@@ -27,12 +27,6 @@
     <item>גלריה</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>דינמי (ברירת מחדל)</item>
-    <item>סטנדרטי</item>
-    <item>טבעי</item>
-    <item>סרט</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>רגיל</item>
     <item>הפוך</item>
diff --git a/AdvancedDisplay/res/values-iw/strings.xml b/AdvancedDisplay/res/values-iw/strings.xml
index dd1b1e9..ed5cbf8 100644
--- a/AdvancedDisplay/res/values-iw/strings.xml
+++ b/AdvancedDisplay/res/values-iw/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">תרחיש</string>
   <string name="mdnie_scenario_summary_head">הגדר תרחיש mDNIe</string>
-  <string name="mdnie_mode_title_head">מצב</string>
-  <string name="mdnie_mode_summary_head">הגדר מצב mDNIe</string>
   <string name="mdnie_negative_title_head">מצב שלילי (נגטיב)</string>
   <string name="mdnie_negative_summary_head">הפעל/השבת צבעים הפוכים</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ja/arrays.xml b/AdvancedDisplay/res/values-ja/arrays.xml
index 8a16ee5..736541f 100644
--- a/AdvancedDisplay/res/values-ja/arrays.xml
+++ b/AdvancedDisplay/res/values-ja/arrays.xml
@@ -27,12 +27,6 @@
     <item>ギャラリー</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>ダイナミック（デフォルト）</item>
-    <item>スタンダード</item>
-    <item>自然</item>
-    <item>映画</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>標準</item>
     <item>反転</item>
diff --git a/AdvancedDisplay/res/values-ja/strings.xml b/AdvancedDisplay/res/values-ja/strings.xml
index 179861c..18abf95 100644
--- a/AdvancedDisplay/res/values-ja/strings.xml
+++ b/AdvancedDisplay/res/values-ja/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">シナリオ</string>
   <string name="mdnie_scenario_summary_head">mDNIeシナリオを設定する</string>
-  <string name="mdnie_mode_title_head">モード</string>
-  <string name="mdnie_mode_summary_head">mDNIeモードを設定する</string>
   <string name="mdnie_negative_title_head">ネガモード</string>
   <string name="mdnie_negative_summary_head">色の反転を有効/無効にする</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-kn-rIN/arrays.xml b/AdvancedDisplay/res/values-kn-rIN/arrays.xml
index 57bf4ad..4b5f414 100644
--- a/AdvancedDisplay/res/values-kn-rIN/arrays.xml
+++ b/AdvancedDisplay/res/values-kn-rIN/arrays.xml
@@ -27,12 +27,6 @@
     <item>ಗ್ಯಾಲರಿ</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>ಕ್ರಿಯಾತ್ಮಕ (ಡೀಫಾಲ್ಟ್)</item>
-    <item>ಸ್ಟಾಂಡರ್ಡ್</item>
-    <item>ನೈಸರ್ಗಿಕ</item>
-    <item>ಸಿನಿಮಾ</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>ಸಾಧಾರಣ</item>
     <item>ಇನ್ವರ್ಟೆಡ್</item>
diff --git a/AdvancedDisplay/res/values-kn-rIN/strings.xml b/AdvancedDisplay/res/values-kn-rIN/strings.xml
index 60867bf..348038c 100644
--- a/AdvancedDisplay/res/values-kn-rIN/strings.xml
+++ b/AdvancedDisplay/res/values-kn-rIN/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">ಸನ್ನಿವೇಶ</string>
   <string name="mdnie_scenario_summary_head">mDNIe ಸನ್ನಿವೇಶವನ್ನು ಹೊಂದಿಸಿ</string>
-  <string name="mdnie_mode_title_head">ಮೋಡ್</string>
-  <string name="mdnie_mode_summary_head">mDNIe ಮೋಡ್ ಹೊಂದಿಸಿ</string>
   <string name="mdnie_negative_title_head">ನೆಗೆಟಿವ್ ಮೋಡ್</string>
   <string name="mdnie_negative_summary_head">ಇನ್ವರ್ಟೆಡ್ ಬಣ್ಣಗಳನ್ನು ಸಕ್ರಿಯ/ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ko/arrays.xml b/AdvancedDisplay/res/values-ko/arrays.xml
index d8872f7..e3fbeb9 100644
--- a/AdvancedDisplay/res/values-ko/arrays.xml
+++ b/AdvancedDisplay/res/values-ko/arrays.xml
@@ -27,12 +27,6 @@
     <item>갤러리</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>다이나믹(기본값)</item>
-    <item>표준</item>
-    <item>자연스러움</item>
-    <item>영화</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>보통</item>
     <item>반전</item>
diff --git a/AdvancedDisplay/res/values-ko/strings.xml b/AdvancedDisplay/res/values-ko/strings.xml
index a33d782..c607226 100644
--- a/AdvancedDisplay/res/values-ko/strings.xml
+++ b/AdvancedDisplay/res/values-ko/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">시나리오</string>
   <string name="mdnie_scenario_summary_head">mDNIe 시나리오 설정</string>
-  <string name="mdnie_mode_title_head">모드</string>
-  <string name="mdnie_mode_summary_head">mDNIe 모드 설정</string>
   <string name="mdnie_negative_title_head">반전 모드</string>
   <string name="mdnie_negative_summary_head">반전된 색상 사용/사용 안 함</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ku/arrays.xml b/AdvancedDisplay/res/values-ku/arrays.xml
index 2e50986..b541ace 100644
--- a/AdvancedDisplay/res/values-ku/arrays.xml
+++ b/AdvancedDisplay/res/values-ku/arrays.xml
@@ -27,12 +27,6 @@
     <item>گەلەری</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>دینامیک (سەرەکی)</item>
-    <item>پێوانەی</item>
-    <item>سروشتی</item>
-    <item>فیلم</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>ئاسایی</item>
     <item>پێچەوانە</item>
diff --git a/AdvancedDisplay/res/values-ku/strings.xml b/AdvancedDisplay/res/values-ku/strings.xml
index 6bf8cb9..d5ca49b 100644
--- a/AdvancedDisplay/res/values-ku/strings.xml
+++ b/AdvancedDisplay/res/values-ku/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">سیناریۆ</string>
   <string name="mdnie_scenario_summary_head">دانانی دۆخی mDNIe سیناریۆ</string>
-  <string name="mdnie_mode_title_head">دۆخ</string>
-  <string name="mdnie_mode_summary_head">دانانی mDNIe باری</string>
   <string name="mdnie_negative_title_head">دۆخی نەرێنی</string>
   <string name="mdnie_negative_summary_head">چالاککردن/ناچالاککردنی ڕه‌نگه‌کان گۆڕاوەکان</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-lb/arrays.xml b/AdvancedDisplay/res/values-lb/arrays.xml
index 270b833..b01294b 100644
--- a/AdvancedDisplay/res/values-lb/arrays.xml
+++ b/AdvancedDisplay/res/values-lb/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galerie</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dynamesch (Standard)</item>
-    <item>Standard</item>
-    <item>Natierlech</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Invertéiert</item>
diff --git a/AdvancedDisplay/res/values-lb/strings.xml b/AdvancedDisplay/res/values-lb/strings.xml
index 0aafe31..1b8489d 100644
--- a/AdvancedDisplay/res/values-lb/strings.xml
+++ b/AdvancedDisplay/res/values-lb/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Zeenario</string>
   <string name="mdnie_scenario_summary_head">mDNIe-Zeenario auswielen</string>
-  <string name="mdnie_mode_title_head">Modus</string>
-  <string name="mdnie_mode_summary_head">mDNIe-Modus setzen</string>
   <string name="mdnie_negative_title_head">Negativ-Modus</string>
   <string name="mdnie_negative_summary_head">Aktivéier/desaktivéier invertéiert Faarwen</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-lv/arrays.xml b/AdvancedDisplay/res/values-lv/arrays.xml
index 01c1dbc..c976f61 100644
--- a/AdvancedDisplay/res/values-lv/arrays.xml
+++ b/AdvancedDisplay/res/values-lv/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galerija</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinamisks (noklusētais)</item>
-    <item>Standarta</item>
-    <item>Dabīgs</item>
-    <item>Filma</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Parasts</item>
     <item>Invertēts</item>
diff --git a/AdvancedDisplay/res/values-lv/strings.xml b/AdvancedDisplay/res/values-lv/strings.xml
index e18dc8c..a309493 100644
--- a/AdvancedDisplay/res/values-lv/strings.xml
+++ b/AdvancedDisplay/res/values-lv/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Scenārijs</string>
   <string name="mdnie_scenario_summary_head">Uzstādīt mDNIe scenāriju</string>
-  <string name="mdnie_mode_title_head">Režīms</string>
-  <string name="mdnie_mode_summary_head">Uzstādīt mDNIe režīmu</string>
   <string name="mdnie_negative_title_head">Negatīvs režīms</string>
   <string name="mdnie_negative_summary_head">Ieslēgt/izslēgt apvērstās krāsas</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ml-rIN/arrays.xml b/AdvancedDisplay/res/values-ml-rIN/arrays.xml
index e733a42..de45c84 100644
--- a/AdvancedDisplay/res/values-ml-rIN/arrays.xml
+++ b/AdvancedDisplay/res/values-ml-rIN/arrays.xml
@@ -27,12 +27,6 @@
     <item>ഗാലറി</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>ഡൈനാമിക്</item>
-    <item>സ്റ്റാൻഡേർഡ്</item>
-    <item>സ്വാഭാവികം</item>
-    <item>സിനിമ</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>സാധാരണം</item>
     <item>വിപരീതദിശയിലാക്കി</item>
diff --git a/AdvancedDisplay/res/values-ml-rIN/strings.xml b/AdvancedDisplay/res/values-ml-rIN/strings.xml
index 80e3fa9..fd22b3d 100644
--- a/AdvancedDisplay/res/values-ml-rIN/strings.xml
+++ b/AdvancedDisplay/res/values-ml-rIN/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">അവസ്ഥ</string>
   <string name="mdnie_scenario_summary_head">mDNle അവസ്ഥ സജ്ജമാക്കാൻ</string>
-  <string name="mdnie_mode_title_head">മോഡ്</string>
-  <string name="mdnie_mode_summary_head">mDNle മോഡ് സജ്ജമാക്കാൻ</string>
   <string name="mdnie_negative_title_head">നെഗറ്റീവ് മോഡ്</string>
   <string name="mdnie_negative_summary_head">വിപരീതം നിറങ്ങൾ ഓൺ-ഓഫ് ചെയ്യുക</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-mr-rIN/arrays.xml b/AdvancedDisplay/res/values-mr-rIN/arrays.xml
index 4318213..81d0356 100644
--- a/AdvancedDisplay/res/values-mr-rIN/arrays.xml
+++ b/AdvancedDisplay/res/values-mr-rIN/arrays.xml
@@ -27,12 +27,6 @@
     <item>गॅलरी</item>
     <item>व्हीटी</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>गतीशील (डिफॉल्ट)</item>
-    <item>मानक</item>
-    <item>नैसर्गिक</item>
-    <item>मुव्ही</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>सामान्य</item>
     <item>अधोमुख</item>
diff --git a/AdvancedDisplay/res/values-mr-rIN/strings.xml b/AdvancedDisplay/res/values-mr-rIN/strings.xml
index 20d6799..35b355e 100644
--- a/AdvancedDisplay/res/values-mr-rIN/strings.xml
+++ b/AdvancedDisplay/res/values-mr-rIN/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">परिस्थिती</string>
   <string name="mdnie_scenario_summary_head">mDNIe परिस्थिती सेट करा</string>
-  <string name="mdnie_mode_title_head">मोड</string>
-  <string name="mdnie_mode_summary_head">mDNIe मोड सेट करा</string>
   <string name="mdnie_negative_title_head">नकारात्मक मोड</string>
   <string name="mdnie_negative_summary_head">अधोमुख रंग सक्षम करा/अक्षम करा</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-nb/arrays.xml b/AdvancedDisplay/res/values-nb/arrays.xml
index 40df8d4..23e3cfc 100644
--- a/AdvancedDisplay/res/values-nb/arrays.xml
+++ b/AdvancedDisplay/res/values-nb/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galleri</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dynamisk (standard)</item>
-    <item>Standard</item>
-    <item>Naturlig</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Invertert</item>
diff --git a/AdvancedDisplay/res/values-nb/strings.xml b/AdvancedDisplay/res/values-nb/strings.xml
index ce56b2d..6a80855 100644
--- a/AdvancedDisplay/res/values-nb/strings.xml
+++ b/AdvancedDisplay/res/values-nb/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Scenario</string>
   <string name="mdnie_scenario_summary_head">Angi mDNIe scenariet</string>
-  <string name="mdnie_mode_title_head">Modus</string>
-  <string name="mdnie_mode_summary_head">Angi mDNIe-modus</string>
   <string name="mdnie_negative_title_head">Negativ modus</string>
   <string name="mdnie_negative_summary_head">Aktiver/deaktiver inverterte farger</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-nl/arrays.xml b/AdvancedDisplay/res/values-nl/arrays.xml
index c02d90d..21b6888 100644
--- a/AdvancedDisplay/res/values-nl/arrays.xml
+++ b/AdvancedDisplay/res/values-nl/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galerij</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dynamisch (standaard)</item>
-    <item>Standaard</item>
-    <item>Natuurlijk</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normaal</item>
     <item>Omgedraaid</item>
diff --git a/AdvancedDisplay/res/values-nl/strings.xml b/AdvancedDisplay/res/values-nl/strings.xml
index a45f20c..1be5713 100644
--- a/AdvancedDisplay/res/values-nl/strings.xml
+++ b/AdvancedDisplay/res/values-nl/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Scenario</string>
   <string name="mdnie_scenario_summary_head">mDNIe-scenario instellen</string>
-  <string name="mdnie_mode_title_head">Modus</string>
-  <string name="mdnie_mode_summary_head">mDNIe-modus instellen</string>
   <string name="mdnie_negative_title_head">Negatieve modus</string>
   <string name="mdnie_negative_summary_head">Negatieve kleuren in-/uitschakelen</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-or-rIN/arrays.xml b/AdvancedDisplay/res/values-or-rIN/arrays.xml
index a6f009a..5c9ce8c 100644
--- a/AdvancedDisplay/res/values-or-rIN/arrays.xml
+++ b/AdvancedDisplay/res/values-or-rIN/arrays.xml
@@ -27,12 +27,6 @@
     <item>ଗ୍ୟାଲେରୀ</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>ଡାଇନାମିକ୍‍ (ଡିଫଲ୍ଟ)</item>
-    <item>ମାନାଙ୍କ</item>
-    <item>ପ୍ରାକୃତିକ</item>
-    <item>ଚଳଚ୍ଚିତ୍ର</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>ସାଧାରଣ</item>
     <item>ଓଲଟା</item>
diff --git a/AdvancedDisplay/res/values-or-rIN/strings.xml b/AdvancedDisplay/res/values-or-rIN/strings.xml
index 087e63d..c6a0d9c 100644
--- a/AdvancedDisplay/res/values-or-rIN/strings.xml
+++ b/AdvancedDisplay/res/values-or-rIN/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">ଦୃଶ୍ୟପଟ</string>
   <string name="mdnie_scenario_summary_head">mDNIe ଦୃଶ୍ୟପଟ ସେଟ୍‍ କରନ୍ତୁ</string>
-  <string name="mdnie_mode_title_head">ମୋଡ୍</string>
-  <string name="mdnie_mode_summary_head">mDNIe ଦୃଶ୍ୟପଟ ସେଟ୍‍ କରନ୍ତୁ</string>
   <string name="mdnie_negative_title_head">ନେଗେଟିଭ୍‍ ମୋଡ୍‍</string>
   <string name="mdnie_negative_summary_head">ଇ‍ନ୍ଭର୍ଟେଡ ରଙ୍ଗ ସଷମ/ଅଷମ କରନ୍ତୁ</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-pl/arrays.xml b/AdvancedDisplay/res/values-pl/arrays.xml
index cc37b65..f78f45b 100644
--- a/AdvancedDisplay/res/values-pl/arrays.xml
+++ b/AdvancedDisplay/res/values-pl/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galeria</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dynamicznie (domyślnie)</item>
-    <item>Standardowo</item>
-    <item>Naturalnie</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normalny</item>
     <item>Odwrócony</item>
diff --git a/AdvancedDisplay/res/values-pl/strings.xml b/AdvancedDisplay/res/values-pl/strings.xml
index c98bd87..c746a26 100644
--- a/AdvancedDisplay/res/values-pl/strings.xml
+++ b/AdvancedDisplay/res/values-pl/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Scenerie</string>
   <string name="mdnie_scenario_summary_head">Ustaw scenariusz mDNIe</string>
-  <string name="mdnie_mode_title_head">Tryb</string>
-  <string name="mdnie_mode_summary_head">Ustaw tryb mDNIe</string>
   <string name="mdnie_negative_title_head">Tryb negatywu</string>
   <string name="mdnie_negative_summary_head">Włącz/wyłącz odwrócone kolory</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-pt-rBR/arrays.xml b/AdvancedDisplay/res/values-pt-rBR/arrays.xml
index 9c6459b..88525ab 100644
--- a/AdvancedDisplay/res/values-pt-rBR/arrays.xml
+++ b/AdvancedDisplay/res/values-pt-rBR/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galeria</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinâmico (padrão)</item>
-    <item>Padrão</item>
-    <item>Natural</item>
-    <item>Filme</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Invertido</item>
diff --git a/AdvancedDisplay/res/values-pt-rBR/strings.xml b/AdvancedDisplay/res/values-pt-rBR/strings.xml
index 99ee5ba..68708f1 100644
--- a/AdvancedDisplay/res/values-pt-rBR/strings.xml
+++ b/AdvancedDisplay/res/values-pt-rBR/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Cenário</string>
   <string name="mdnie_scenario_summary_head">Define o cenário mDNIe</string>
-  <string name="mdnie_mode_title_head">Modo</string>
-  <string name="mdnie_mode_summary_head">Define o modo mDNIe</string>
   <string name="mdnie_negative_title_head">Modo negativo</string>
   <string name="mdnie_negative_summary_head">Ativar/desativar cores invertidas</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-pt-rPT/arrays.xml b/AdvancedDisplay/res/values-pt-rPT/arrays.xml
index 432b0d6..6095207 100644
--- a/AdvancedDisplay/res/values-pt-rPT/arrays.xml
+++ b/AdvancedDisplay/res/values-pt-rPT/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galeria</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinâmico (padrão)</item>
-    <item>Padrão</item>
-    <item>Natural</item>
-    <item>Cinema</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Invertido</item>
diff --git a/AdvancedDisplay/res/values-pt-rPT/strings.xml b/AdvancedDisplay/res/values-pt-rPT/strings.xml
index e74b390..fdcabb5 100644
--- a/AdvancedDisplay/res/values-pt-rPT/strings.xml
+++ b/AdvancedDisplay/res/values-pt-rPT/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Cenário</string>
   <string name="mdnie_scenario_summary_head">Definir o cenário mDNIe</string>
-  <string name="mdnie_mode_title_head">Modo</string>
-  <string name="mdnie_mode_summary_head">Definir o modo mDNIe</string>
   <string name="mdnie_negative_title_head">Modo negativo</string>
   <string name="mdnie_negative_summary_head">Ativar/desativar cores invertidas</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ro/arrays.xml b/AdvancedDisplay/res/values-ro/arrays.xml
index a3f3dbf..4acc6fd 100644
--- a/AdvancedDisplay/res/values-ro/arrays.xml
+++ b/AdvancedDisplay/res/values-ro/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galerie</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinamic (implicit)</item>
-    <item>Standard</item>
-    <item>Natural</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Inversat</item>
diff --git a/AdvancedDisplay/res/values-ro/strings.xml b/AdvancedDisplay/res/values-ro/strings.xml
index cb379fa..1c5e86b 100644
--- a/AdvancedDisplay/res/values-ro/strings.xml
+++ b/AdvancedDisplay/res/values-ro/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Scenariu</string>
   <string name="mdnie_scenario_summary_head">Setează scenariul mDNIe</string>
-  <string name="mdnie_mode_title_head">Mod</string>
-  <string name="mdnie_mode_summary_head">Setează modul mDNIe</string>
   <string name="mdnie_negative_title_head">Mod culori negative</string>
   <string name="mdnie_negative_summary_head">Activează/dezactivează culori inversate</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ru/arrays.xml b/AdvancedDisplay/res/values-ru/arrays.xml
index 581c995..60fc79a 100644
--- a/AdvancedDisplay/res/values-ru/arrays.xml
+++ b/AdvancedDisplay/res/values-ru/arrays.xml
@@ -27,12 +27,6 @@
     <item>Галерея</item>
     <item>Видеосвязь</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Динамический (по умолч.)</item>
-    <item>Стандартный</item>
-    <item>Естественный</item>
-    <item>Фильм</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Обычный</item>
     <item>Инверсия</item>
diff --git a/AdvancedDisplay/res/values-ru/strings.xml b/AdvancedDisplay/res/values-ru/strings.xml
index 335e531..fca183f 100644
--- a/AdvancedDisplay/res/values-ru/strings.xml
+++ b/AdvancedDisplay/res/values-ru/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Сценарий</string>
   <string name="mdnie_scenario_summary_head">Установка сценария mDNIe</string>
-  <string name="mdnie_mode_title_head">Режим</string>
-  <string name="mdnie_mode_summary_head">Установка режима mDNIe</string>
   <string name="mdnie_negative_title_head">Негатив</string>
   <string name="mdnie_negative_summary_head">Включить инверсию цвета</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-sk/arrays.xml b/AdvancedDisplay/res/values-sk/arrays.xml
index 807ff56..0c805cb 100644
--- a/AdvancedDisplay/res/values-sk/arrays.xml
+++ b/AdvancedDisplay/res/values-sk/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galéria</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dynamický (predvolené)</item>
-    <item>Štandardné</item>
-    <item>Prirodzené</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normálne</item>
     <item>Obrátené</item>
diff --git a/AdvancedDisplay/res/values-sk/strings.xml b/AdvancedDisplay/res/values-sk/strings.xml
index b65dec3..340001c 100644
--- a/AdvancedDisplay/res/values-sk/strings.xml
+++ b/AdvancedDisplay/res/values-sk/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Scenár</string>
   <string name="mdnie_scenario_summary_head">Nastaviť scenár mDNIe</string>
-  <string name="mdnie_mode_title_head">Režim</string>
-  <string name="mdnie_mode_summary_head">Nastaviť režim mDNIe</string>
   <string name="mdnie_negative_title_head">Inverzný režim</string>
   <string name="mdnie_negative_summary_head">Povoliť/zakázať obrátené farby</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-sl/arrays.xml b/AdvancedDisplay/res/values-sl/arrays.xml
index c6790a5..ebd75ff 100644
--- a/AdvancedDisplay/res/values-sl/arrays.xml
+++ b/AdvancedDisplay/res/values-sl/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galerija</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinamični (privzeti)</item>
-    <item>Običajni</item>
-    <item>Naravni</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Običajno</item>
     <item>Obrnjeno</item>
diff --git a/AdvancedDisplay/res/values-sl/strings.xml b/AdvancedDisplay/res/values-sl/strings.xml
index a857a6a..87651d1 100644
--- a/AdvancedDisplay/res/values-sl/strings.xml
+++ b/AdvancedDisplay/res/values-sl/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Scenarij</string>
   <string name="mdnie_scenario_summary_head">Nastavite scenarij mDNIe</string>
-  <string name="mdnie_mode_title_head">Način</string>
-  <string name="mdnie_mode_summary_head">Nastavite način mDNIe</string>
   <string name="mdnie_negative_title_head">Način negativa</string>
   <string name="mdnie_negative_summary_head">Omogoči/Onemogoči obrnjene barve</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-sr/arrays.xml b/AdvancedDisplay/res/values-sr/arrays.xml
index 8225328..4692e3f 100644
--- a/AdvancedDisplay/res/values-sr/arrays.xml
+++ b/AdvancedDisplay/res/values-sr/arrays.xml
@@ -27,12 +27,6 @@
     <item>Галерија</item>
     <item>ВТ</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Динамично (подразумевано)</item>
-    <item>Стандардно</item>
-    <item>Природно</item>
-    <item>Филм</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Нормално</item>
     <item>Обрнуто</item>
diff --git a/AdvancedDisplay/res/values-sr/strings.xml b/AdvancedDisplay/res/values-sr/strings.xml
index 6020ecb..6115b90 100644
--- a/AdvancedDisplay/res/values-sr/strings.xml
+++ b/AdvancedDisplay/res/values-sr/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Сценарио</string>
   <string name="mdnie_scenario_summary_head">Постави mDNIe сценарио</string>
-  <string name="mdnie_mode_title_head">Режим</string>
-  <string name="mdnie_mode_summary_head">Постави mDNIe режим</string>
   <string name="mdnie_negative_title_head">Негативни режим</string>
   <string name="mdnie_negative_summary_head">Омогући/онемогући обрнуте боје</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-sv/arrays.xml b/AdvancedDisplay/res/values-sv/arrays.xml
index b8b8fca..6916ed9 100644
--- a/AdvancedDisplay/res/values-sv/arrays.xml
+++ b/AdvancedDisplay/res/values-sv/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galleri</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dynamisk (standard)</item>
-    <item>Standard</item>
-    <item>Naturlig</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Inverterad</item>
diff --git a/AdvancedDisplay/res/values-sv/strings.xml b/AdvancedDisplay/res/values-sv/strings.xml
index 9511ccd..ec522df 100644
--- a/AdvancedDisplay/res/values-sv/strings.xml
+++ b/AdvancedDisplay/res/values-sv/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Scenario</string>
   <string name="mdnie_scenario_summary_head">Ställ in mDNIe-scenario</string>
-  <string name="mdnie_mode_title_head">Läge</string>
-  <string name="mdnie_mode_summary_head">Ställ in mDNIe läge</string>
   <string name="mdnie_negative_title_head">Negativt läge</string>
   <string name="mdnie_negative_summary_head">Aktivera/inaktivera inverterade färger</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ta-rIN/arrays.xml b/AdvancedDisplay/res/values-ta-rIN/arrays.xml
index 7764a05..197fb05 100644
--- a/AdvancedDisplay/res/values-ta-rIN/arrays.xml
+++ b/AdvancedDisplay/res/values-ta-rIN/arrays.xml
@@ -27,12 +27,6 @@
     <item>படத்தொகுப்பு</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>டைனமிக் (இயல்புநிலை)</item>
-    <item>நிலையான</item>
-    <item>இயற்கை</item>
-    <item>திரைப்படம்</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>இயல்பு</item>
     <item>திருப்பிவிடப்பட்ட</item>
diff --git a/AdvancedDisplay/res/values-ta-rIN/strings.xml b/AdvancedDisplay/res/values-ta-rIN/strings.xml
index 5b4aaa4..ab05537 100644
--- a/AdvancedDisplay/res/values-ta-rIN/strings.xml
+++ b/AdvancedDisplay/res/values-ta-rIN/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">சூழ்நிலை</string>
   <string name="mdnie_scenario_summary_head">mDNIe சூழ்நிலையை அமை</string>
-  <string name="mdnie_mode_title_head">பயன்முறை</string>
-  <string name="mdnie_mode_summary_head">mDNIe பயன்முறையை அமை</string>
   <string name="mdnie_negative_title_head">எதிர்மறை பயன்முறை</string>
   <string name="mdnie_negative_summary_head">இன்வர்டடு வண்னங்களை செயல்படுத்து/முடக்கு</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-te-rIN/arrays.xml b/AdvancedDisplay/res/values-te-rIN/arrays.xml
index a20af6b..5cc54fe 100644
--- a/AdvancedDisplay/res/values-te-rIN/arrays.xml
+++ b/AdvancedDisplay/res/values-te-rIN/arrays.xml
@@ -27,12 +27,6 @@
     <item>గ్యాలరీ</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>డైనమిక్ (స్వయంసిద్ధం)</item>
-    <item>ప్రామాణిక</item>
-    <item>సహజమైన</item>
-    <item>చలనచిత్రం</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>సాధారణం</item>
     <item>తిరగబడిన</item>
diff --git a/AdvancedDisplay/res/values-te-rIN/strings.xml b/AdvancedDisplay/res/values-te-rIN/strings.xml
index dd44c2e..f439727 100644
--- a/AdvancedDisplay/res/values-te-rIN/strings.xml
+++ b/AdvancedDisplay/res/values-te-rIN/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">దృశ్యవివరణ</string>
   <string name="mdnie_scenario_summary_head">mDNIe దృశ్యవివరణను సెట్ చేయుము</string>
-  <string name="mdnie_mode_title_head">మోడ్</string>
-  <string name="mdnie_mode_summary_head">mDNIe రీతిని సెట్ చేయుము</string>
   <string name="mdnie_negative_title_head">వ్యతిరేక రీతి</string>
   <string name="mdnie_negative_summary_head">విలోమ రంగులను అమలు చెయ్యి/నిలిపివెయ్యి</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-th/arrays.xml b/AdvancedDisplay/res/values-th/arrays.xml
index 09294e2..c361c52 100644
--- a/AdvancedDisplay/res/values-th/arrays.xml
+++ b/AdvancedDisplay/res/values-th/arrays.xml
@@ -26,13 +26,7 @@
     <item>การนำทาง</item>
     <item>แกลเลอรี</item>
     <item>VT</item>
-  </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>ไดนามิก (เริ่มต้น)</item>
-    <item>มาตรฐาน</item>
-    <item>ธรรมชาติ</item>
-    <item>ภาพยนตร์</item>
-  </string-array>
+</string-array>
   <string-array name="mdnie_negative_entries">
     <item>ปกติ</item>
     <item>กลับแล้ว</item>
diff --git a/AdvancedDisplay/res/values-th/strings.xml b/AdvancedDisplay/res/values-th/strings.xml
index feb5a59..597722f 100644
--- a/AdvancedDisplay/res/values-th/strings.xml
+++ b/AdvancedDisplay/res/values-th/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">สถานการณ์</string>
   <string name="mdnie_scenario_summary_head">กำหนดสถานการณ์ mDNIe</string>
-  <string name="mdnie_mode_title_head">รูปแบบ</string>
-  <string name="mdnie_mode_summary_head">กำหนดรูปแบบ mDNIe</string>
   <string name="mdnie_negative_title_head">รูปแบบกลับสี</string>
   <string name="mdnie_negative_summary_head">เปิด/ปิดสีที่สลับ</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-tr/arrays.xml b/AdvancedDisplay/res/values-tr/arrays.xml
index f029f0d..0eb5352 100644
--- a/AdvancedDisplay/res/values-tr/arrays.xml
+++ b/AdvancedDisplay/res/values-tr/arrays.xml
@@ -27,12 +27,6 @@
     <item>Galeri</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Dinamik (varsayılan)</item>
-    <item>Standart</item>
-    <item>Doğal</item>
-    <item>Film</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Normal</item>
     <item>Ters çevrilmiş</item>
diff --git a/AdvancedDisplay/res/values-tr/strings.xml b/AdvancedDisplay/res/values-tr/strings.xml
index 4df212f..aa2bac5 100644
--- a/AdvancedDisplay/res/values-tr/strings.xml
+++ b/AdvancedDisplay/res/values-tr/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Ekran Modu</string>
   <string name="mdnie_scenario_summary_head">mDNIe senaryosunu ayarla</string>
-  <string name="mdnie_mode_title_head">Mod</string>
-  <string name="mdnie_mode_summary_head">mDNIe modunu ayarla</string>
   <string name="mdnie_negative_title_head">Negatif modu</string>
   <string name="mdnie_negative_summary_head">Ters renkleri aç/kapat</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-ug/arrays.xml b/AdvancedDisplay/res/values-ug/arrays.xml
index c8f3f6b..9390a95 100644
--- a/AdvancedDisplay/res/values-ug/arrays.xml
+++ b/AdvancedDisplay/res/values-ug/arrays.xml
@@ -27,12 +27,6 @@
     <item>ئالبۇم</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>ھەرىكەتچان (كۆڭۈلدىكى)</item>
-    <item>ئۆلچەملىك</item>
-    <item>تەبىئىي</item>
-    <item>كىنو</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>نورمال</item>
     <item>ئەكسىچە</item>
diff --git a/AdvancedDisplay/res/values-ug/strings.xml b/AdvancedDisplay/res/values-ug/strings.xml
index 11b8bae..8a757f6 100644
--- a/AdvancedDisplay/res/values-ug/strings.xml
+++ b/AdvancedDisplay/res/values-ug/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">كۆرۈنۈش</string>
   <string name="mdnie_scenario_summary_head">mDNIe لايىھە تەڭشىكى</string>
-  <string name="mdnie_mode_title_head">ھالەت</string>
-  <string name="mdnie_mode_summary_head">mDNIe ھالەت تەڭشىكى</string>
   <string name="mdnie_negative_title_head">‫مەنپىي ھالەت</string>
   <string name="mdnie_negative_summary_head">ئەكسىچە رەڭنى قوزغىتىش/چەكلەش</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-uk/arrays.xml b/AdvancedDisplay/res/values-uk/arrays.xml
index 3c20632..f33fcf8 100644
--- a/AdvancedDisplay/res/values-uk/arrays.xml
+++ b/AdvancedDisplay/res/values-uk/arrays.xml
@@ -27,12 +27,6 @@
     <item>Галерея</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Динамічний (типово)</item>
-    <item>Стандартний</item>
-    <item>Натуральний</item>
-    <item>Кіно</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Звичайний</item>
     <item>Негатив</item>
diff --git a/AdvancedDisplay/res/values-uk/strings.xml b/AdvancedDisplay/res/values-uk/strings.xml
index e900e2a..5986179 100644
--- a/AdvancedDisplay/res/values-uk/strings.xml
+++ b/AdvancedDisplay/res/values-uk/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Сценарій</string>
   <string name="mdnie_scenario_summary_head">Встановити сценарій mDNIe</string>
-  <string name="mdnie_mode_title_head">Режим</string>
-  <string name="mdnie_mode_summary_head">Встановити режим mDNIe</string>
   <string name="mdnie_negative_title_head">Режим негатив</string>
   <string name="mdnie_negative_summary_head">Увімкнути/вимкнути інвертовані кольори</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-vi/arrays.xml b/AdvancedDisplay/res/values-vi/arrays.xml
index 3e7a7e9..0a49898 100644
--- a/AdvancedDisplay/res/values-vi/arrays.xml
+++ b/AdvancedDisplay/res/values-vi/arrays.xml
@@ -27,12 +27,6 @@
     <item>Thư viện</item>
     <item>Công nghệ ảo hóa</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>Động (mặc định)</item>
-    <item>Tiêu chuẩn</item>
-    <item>Tự nhiên</item>
-    <item>Phim</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>Thông thường</item>
     <item>Đảo ngược</item>
diff --git a/AdvancedDisplay/res/values-vi/strings.xml b/AdvancedDisplay/res/values-vi/strings.xml
index 47a93dd..a8d2dc0 100644
--- a/AdvancedDisplay/res/values-vi/strings.xml
+++ b/AdvancedDisplay/res/values-vi/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">Tình huống</string>
   <string name="mdnie_scenario_summary_head">Đặt tình huống cho mDNIe</string>
-  <string name="mdnie_mode_title_head">Chế độ</string>
-  <string name="mdnie_mode_summary_head">Đặt chế độ mDNle</string>
   <string name="mdnie_negative_title_head">Chế độ màu âm bản</string>
   <string name="mdnie_negative_summary_head">Bật/tắt đảo ngược màu sắc</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-zh-rCN/arrays.xml b/AdvancedDisplay/res/values-zh-rCN/arrays.xml
index ef5d04a..f018066 100644
--- a/AdvancedDisplay/res/values-zh-rCN/arrays.xml
+++ b/AdvancedDisplay/res/values-zh-rCN/arrays.xml
@@ -27,12 +27,6 @@
     <item>图库</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>动态 (默认)</item>
-    <item>标准</item>
-    <item>自然</item>
-    <item>影片</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>正常</item>
     <item>反色</item>
diff --git a/AdvancedDisplay/res/values-zh-rCN/strings.xml b/AdvancedDisplay/res/values-zh-rCN/strings.xml
index 2094a21..7133e6b 100644
--- a/AdvancedDisplay/res/values-zh-rCN/strings.xml
+++ b/AdvancedDisplay/res/values-zh-rCN/strings.xml
@@ -23,8 +23,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">场景</string>
   <string name="mdnie_scenario_summary_head">设置 mDNIe 场景</string>
-  <string name="mdnie_mode_title_head">模式</string>
-  <string name="mdnie_mode_summary_head">设置 mDNIe 模式</string>
   <string name="mdnie_negative_title_head">负极模式</string>
   <string name="mdnie_negative_summary_head">启用/禁用反色</string>
 </resources>
diff --git a/AdvancedDisplay/res/values-zh-rHK/arrays.xml b/AdvancedDisplay/res/values-zh-rHK/arrays.xml
index 0a488ed..6b13ec4 100644
--- a/AdvancedDisplay/res/values-zh-rHK/arrays.xml
+++ b/AdvancedDisplay/res/values-zh-rHK/arrays.xml
@@ -27,12 +27,6 @@
     <item>圖片庫</item>
     <item>VT</item>
   </string-array>
-  <string-array name="mdnie_mode_entries">
-    <item>動感（預設）</item>
-    <item>標準</item>
-    <item>自然</item>
-    <item>影片</item>
-  </string-array>
   <string-array name="mdnie_negative_entries">
     <item>適中</item>
     <item>反向</item>
diff --git a/AdvancedDisplay/res/values-zh-rHK/strings.xml b/AdvancedDisplay/res/values-zh-rHK/strings.xml
index 315bfea..45f5c42 100644
--- a/AdvancedDisplay/res/values-zh-rHK/strings.xml
+++ b/AdvancedDisplay/res/values-zh-rHK/strings.xml
@@ -21,8 +21,6 @@
   <!-- mDNIe -->
   <string name="mdnie_scenario_title_head">場景</string>
   <string name="mdnie_scenario_summary_head">設定 mDNIe 場景</string>
-  <string name="mdnie_mode_title_head">模式</string>
-  <string name="mdnie_mode_summary_head">設定 mDNIe 模式</string>
   <string name="mdnie_negative_title_head">負片模式</string>
   <string name="mdnie_negative_summary_head">啟用/停用反向顏色</string>
 </resources>
diff --git a/AdvancedDisplay/res/values/arrays.xml b/AdvancedDisplay/res/values/arrays.xml
index be9f348..bfa29e6 100644
--- a/AdvancedDisplay/res/values/arrays.xml
+++ b/AdvancedDisplay/res/values/arrays.xml
@@ -39,20 +39,6 @@
         <item>8</item>
     </string-array>
 
-    <string-array name="mdnie_mode_entries">
-        <item>Dynamic (default)</item>
-        <item>Standard</item>
-        <item>Natural</item>
-        <item>Movie</item>
-    </string-array>
-
-    <string-array name="mdnie_mode_entries_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
-
     <string-array name="mdnie_negative_entries">
         <item>Normal</item>
         <item>Inverted</item>
diff --git a/AdvancedDisplay/res/values/config.xml b/AdvancedDisplay/res/values/config.xml
index a26bed0..1bb5c1a 100644
--- a/AdvancedDisplay/res/values/config.xml
+++ b/AdvancedDisplay/res/values/config.xml
@@ -20,7 +20,6 @@
 
     <!-- MDNIE -->
     <string name="mdnie_scenario_sysfs_file" translatable="false">"/sys/class/mdnie/mdnie/scenario"</string>
-    <string name="mdnie_mode_sysfs_file" translatable="false">"/sys/class/mdnie/mdnie/mode"</string>
     <string name="mdnie_negative_sysfs_file" translatable="false">"/sys/class/mdnie/mdnie/negative"</string>
 
 </resources>
diff --git a/AdvancedDisplay/res/values/strings.xml b/AdvancedDisplay/res/values/strings.xml
index 6e6d213..42cdc6c 100644
--- a/AdvancedDisplay/res/values/strings.xml
+++ b/AdvancedDisplay/res/values/strings.xml
@@ -24,8 +24,6 @@
     <!-- mDNIe -->
     <string name="mdnie_scenario_title_head">Scenario</string>
     <string name="mdnie_scenario_summary_head">Set the mDNIe scenario</string>
-    <string name="mdnie_mode_title_head">Mode</string>
-    <string name="mdnie_mode_summary_head">Set the mDNIe mode</string>
     <string name="mdnie_negative_title_head">Negative mode</string>
     <string name="mdnie_negative_summary_head">Enable/disable inverted colors</string>
 </resources>
diff --git a/AdvancedDisplay/res/xml/screen_preferences.xml b/AdvancedDisplay/res/xml/screen_preferences.xml
index 56e536c..2223cdb 100644
--- a/AdvancedDisplay/res/xml/screen_preferences.xml
+++ b/AdvancedDisplay/res/xml/screen_preferences.xml
@@ -14,15 +14,6 @@
                 android:entryValues="@array/mdnie_scenario_entries_values"
                 android:defaultValue="0" />
 
-        <!-- mDNIe Mode -->
-        <com.cyanogenmod.settings.device.mDNIeMode
-                android:key="mdnie_mode"
-                android:title="@string/mdnie_mode_title_head"
-                android:summary="@string/mdnie_mode_summary_head"
-                android:entries="@array/mdnie_mode_entries"
-                android:entryValues="@array/mdnie_mode_entries_values"
-                android:defaultValue="0" />
-
         <!-- mDNIe Negative mode -->
         <com.cyanogenmod.settings.device.mDNIeNegative
                 android:key="mdnie_negative"
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;
-    }
-
-}
diff --git a/cmhw/org/cyanogenmod/hardware/DisplayModeControl.java b/cmhw/org/cyanogenmod/hardware/DisplayModeControl.java
new file mode 100644
index 0000000..c60027f
--- /dev/null
+++ b/cmhw/org/cyanogenmod/hardware/DisplayModeControl.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2015-2016 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 org.cyanogenmod.hardware;
+
+import cyanogenmod.hardware.DisplayMode;
+import org.cyanogenmod.internal.util.FileUtils;
+
+import java.util.Arrays;
+
+/*
+ * Display Modes API
+ *
+ * A device may implement a list of preset display modes for different
+ * viewing intents, such as movies, photos, or extra vibrance. These
+ * modes may have multiple components such as gamma correction, white
+ * point adjustment, etc, but are activated by a single control point.
+ *
+ * This API provides support for enumerating and selecting the
+ * modes supported by the hardware.
+ */
+
+public class DisplayModeControl {
+
+    private static final String MODE_PATH = "/sys/class/mdnie/mdnie/mode";
+    private static final String MAX_PATH = "/sys/class/mdnie/mdnie/mode_max";
+    private static final String DEFAULT_PATH = "/data/misc/.displaymodedefault";
+
+    private static final DisplayMode[] DISPLAY_MODES = {
+        new DisplayMode(0, "Dynamic"),
+        new DisplayMode(1, "Standard"),
+        new DisplayMode(2, "Natural"),
+        new DisplayMode(3, "Cinema"),
+        new DisplayMode(4, "Adaptive"),
+    };
+
+    static {
+        if (FileUtils.isFileReadable(DEFAULT_PATH)) {
+            setMode(getDefaultMode(), false);
+        } else if (FileUtils.isFileReadable(MODE_PATH)) {
+            /* If default mode is not set yet, set current mode as default */
+            setMode(getCurrentMode(), true);
+        }
+    }
+
+    /*
+     * All HAF classes should export this boolean.
+     * Real implementations must, of course, return true
+     */
+    public static boolean isSupported() {
+        return FileUtils.isFileWritable(MODE_PATH) &&
+                FileUtils.isFileReadable(MODE_PATH) &&
+                FileUtils.isFileWritable(DEFAULT_PATH) &&
+                FileUtils.isFileReadable(DEFAULT_PATH);
+    }
+
+    /*
+     * Get the list of available modes. A mode has an integer
+     * identifier and a string name.
+     *
+     * It is the responsibility of the upper layers to
+     * map the name to a human-readable format or perform translation.
+     */
+    public static DisplayMode[] getAvailableModes() {
+        /* node is unreadable */
+        if (!FileUtils.isFileReadable(MAX_PATH)) {
+            return DISPLAY_MODES;
+        }
+
+        int max;
+        try {
+            max = Integer.parseInt(FileUtils.readOneLine(MAX_PATH));
+        } catch (NumberFormatException e) {
+            /* max is not an integer */
+            return DISPLAY_MODES;
+        }
+
+        /* max is invalid */
+        return Arrays.copyOfRange(DISPLAY_MODES, 0,
+                max >= 0 ? max : DISPLAY_MODES.length);
+    }
+
+    /*
+     * Get the name of the currently selected mode. This can return
+     * null if no mode is selected.
+     */
+    public static DisplayMode getCurrentMode() {
+        try {
+            int mode = Integer.parseInt(FileUtils.readOneLine(MODE_PATH));
+            return DISPLAY_MODES[mode];
+        } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
+            return null;
+        }
+    }
+
+    /*
+     * Selects a mode from the list of available modes by it's
+     * string identifier. Returns true on success, false for
+     * failure. It is up to the implementation to determine
+     * if this mode is valid.
+     */
+    public static boolean setMode(DisplayMode mode, boolean makeDefault) {
+        boolean success = FileUtils.writeLine(MODE_PATH, String.valueOf(mode.id));
+        if (success && makeDefault) {
+            return FileUtils.writeLine(DEFAULT_PATH, String.valueOf(mode.id));
+        }
+
+        return success;
+    }
+
+    /*
+     * Gets the preferred default mode for this device by it's
+     * string identifier. Can return null if there is no default.
+     */
+    public static DisplayMode getDefaultMode() {
+        try {
+            int mode = Integer.parseInt(FileUtils.readOneLine(DEFAULT_PATH));
+            return DISPLAY_MODES[mode];
+        } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
+            return null;
+        }
+    }
+}