livedisplay: Moving LiveDisplay to CMSDK

 * Remove all LiveDisplay-related code from the framework, and
   update the QS tile for the new API.

Change-Id: I41c04a254afa91c0ed26c050362b63049d489fba

105 files changed, 32 insertions, 1535 deletions

diff --git a/core/res/res/values-af/cm_strings.xml b/core/res/res/values-af/cm_strings.xml
index c6b23b9999f..993e77590ad 100644
--- a/core/res/res/values-af/cm_strings.xml
+++ b/core/res/res/values-af/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">kry root toegang</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Om die skerm te ontspeld, raak en hou die Terug knoppie.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Outomaties</string>
-  <string name="live_display_auto_summary">Kleurtemperatuur van die skerm sal outomaties aanpas na sononder en sonop</string>
-  <string name="live_display_off">Af</string>
-  <string name="live_display_off_summary">Skakel al die aanpassings af</string>
-  <string name="live_display_day">Dag</string>
-  <string name="live_display_day_summary">Alleenlik gebruik dag instellings</string>
-  <string name="live_display_night">Nag</string>
-  <string name="live_display_night_summary">Alleenlik gebruik nag instellings</string>
-  <string name="live_display_outdoor">Buitekant (helder son)</string>
-  <string name="live_display_outdoor_summary">Alleenlik gebruik buite instellings</string>
-  <string name="live_display_hint">LewendigeVertoning kan jou oogspanning verminder en help jou slaap in die nag. Klik hier om dit uit te probeer!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Geen gekoppelde toestel</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> gekoppelde toestel</string>
diff --git a/core/res/res/values-am/cm_strings.xml b/core/res/res/values-am/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-am/cm_strings.xml
+++ b/core/res/res/values-am/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-ar/cm_strings.xml b/core/res/res/values-ar/cm_strings.xml
index d07400d516a..4d305cf4ba9 100644
--- a/core/res/res/values-ar/cm_strings.xml
+++ b/core/res/res/values-ar/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">الحصول على صلاحيات الجذر</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">لإلغاء تثبيت هذه الشاشة، المس واستمر في ضغط زر الرجوع.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">تلقائي</string>
-  <string name="live_display_auto_summary">ضبط درجة حرارة لون للشاشة تلقائياً بعد غروب الشمس وشروق الشمس</string>
-  <string name="live_display_off">إيقاف</string>
-  <string name="live_display_off_summary">تعطيل جميع التعديلات</string>
-  <string name="live_display_day">النهار</string>
-  <string name="live_display_day_summary">استخدام إعدادات النهار فقط</string>
-  <string name="live_display_night">الليل</string>
-  <string name="live_display_night_summary">استخدام إعدادات الليل فقط</string>
-  <string name="live_display_outdoor">خارج المنزل ( شمس ساطعة)</string>
-  <string name="live_display_outdoor_summary">استخدم إعدادات خارج المنزل  فقط</string>
-  <string name="live_display_hint">ميزة LiveDisplay يمكن أن تساعد في تقليل إجهاد العين والمساعدة على النوم في الليل. انقر هنا لتجربته!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">لا يوجد جهاز متصل</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s </xliff:g> جهاز متصل</string>
diff --git a/core/res/res/values-as-rIN/cm_strings.xml b/core/res/res/values-as-rIN/cm_strings.xml
index c0ebb2a6438..c41062011db 100644
--- a/core/res/res/values-as-rIN/cm_strings.xml
+++ b/core/res/res/values-as-rIN/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">ৰুট প্ৰৱেশাধিকাৰ প্ৰাপ্ত কৰা</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">এই স্ক্ৰীণ আনপিন কৰিবলৈ, বেক বুটামটো স্পৰ্শ কৰক আৰু হেঁচি ৰাখক।</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">স্বয়ংক্ৰিয়</string>
-  <string name="live_display_auto_summary">সূৰ্যাস্ত আৰু সূৰ্যোদয়ৰ পাছত স্বয়ংক্ৰিয়ভাবে স্ক্ৰীণৰ ৰং তাপমাত্ৰা মিলাওক।</string>
-  <string name="live_display_off">অফ</string>
-  <string name="live_display_off_summary">সকলো সমাযোজন অক্ষম কৰক</string>
-  <string name="live_display_day">দিন</string>
-  <string name="live_display_day_summary">কেৱল দিনৰ ছেটিংচ ব্যৱহাৰ কৰক</string>
-  <string name="live_display_night">নাইট</string>
-  <string name="live_display_night_summary">কেৱল ৰাতিৰ ছেটিংচ ব্যৱহাৰ কৰক</string>
-  <string name="live_display_outdoor">আউটডোৰ (উজ্জ্বল ৰ\'দ)</string>
-  <string name="live_display_outdoor_summary">কেৱল আউটডোৰ ছেটিংচ ব্যৱহাৰ কৰক</string>
-  <string name="live_display_hint">লাইভপ্রদর্শন আপোনাৰ চকুৰ ওপৰত চাপ কমাব পাৰে আৰু ৰাতি শোৱাত সহায় কৰিব পাৰে। ইয়াক চেষ্টা কৰি চাবলৈ ইয়াত ক্লিক কৰক!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">কোনো সংযোগিত ডিভাইচ নাই</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> সংযোগিত ডিভাইচ</string>
diff --git a/core/res/res/values-ast-rES/cm_strings.xml b/core/res/res/values-ast-rES/cm_strings.xml
index 28097740730..9c65ae05362 100644
--- a/core/res/res/values-ast-rES/cm_strings.xml
+++ b/core/res/res/values-ast-rES/cm_strings.xml
@@ -150,18 +150,6 @@
   <string name="app_ops_write_sms">escribir un mensaxe SMS</string>
   <string name="app_ops_su">obtener accesu root</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automáticu</string>
-  <string name="live_display_auto_summary">Axustar automáticamente la temperatura del color de pantalla col alborecer y l\'atapecer</string>
-  <string name="live_display_off">Desactiváu</string>
-  <string name="live_display_off_summary">Deshabilitar tolos axustes</string>
-  <string name="live_display_day">Día</string>
-  <string name="live_display_day_summary">Usar namái los axustes de día</string>
-  <string name="live_display_night">Nueche</string>
-  <string name="live_display_night_summary">Usar namái los axustes de nueche</string>
-  <string name="live_display_outdoor">Esterior (lluz del sol)</string>
-  <string name="live_display_outdoor_summary">Usar namái axustes del esterior</string>
-  <string name="live_display_hint">LiveDisplay pue amenorgar reducir la fatiga visual y ayudar a dormir pela nueche. ¡Toca equí pa probalu!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nun hai dengún preséu coneutáu</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> preséu coneutáu</string>
diff --git a/core/res/res/values-az-rAZ/cm_strings.xml b/core/res/res/values-az-rAZ/cm_strings.xml
index 77dde703ecb..519809f53e2 100644
--- a/core/res/res/values-az-rAZ/cm_strings.xml
+++ b/core/res/res/values-az-rAZ/cm_strings.xml
@@ -151,18 +151,6 @@
   <string name="app_ops_su">root müraciəti əldə et</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Bu ekranı çıxarmaq üçün Geri düyməsinə toxunub basılı tutun.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Avtomatik</string>
-  <string name="live_display_auto_summary">Gün çıxandan və batandan sonra ekranın rəng hərarətini avtomatik tənzimləyər</string>
-  <string name="live_display_off">Bağlı</string>
-  <string name="live_display_off_summary">Bütün tənzimləmələri ləğv et</string>
-  <string name="live_display_day">Gündüz</string>
-  <string name="live_display_day_summary">Yalnız gündüz tənziml. istifadə et</string>
-  <string name="live_display_night">Gecə</string>
-  <string name="live_display_night_summary">Yalnız gecə tənziml. istifadə et</string>
-  <string name="live_display_outdoor">Açıq hava (parlaq günəş)</string>
-  <string name="live_display_outdoor_summary">Yalnız açıq hava tənziml. istifadə et</string>
-  <string name="live_display_hint">LiveDisplay göz yorğunluğunuzu azaldıb gecələri yuxulamağınıza kömək edə bilər. Yoxlamaq üçün bura klikləyin!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Bağlı cihaz yoxdur</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> cihaz bağlıdır</string>
diff --git a/core/res/res/values-be/cm_strings.xml b/core/res/res/values-be/cm_strings.xml
index a08f7bef222..8a524bc39dc 100644
--- a/core/res/res/values-be/cm_strings.xml
+++ b/core/res/res/values-be/cm_strings.xml
@@ -167,18 +167,6 @@
   <string name="app_ops_su">атрымаць правы суперкарыстальніка</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Каб адмацаваць экран, націсніце і ўтрымвайце кнопку \"Назад\".</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Аўтаматычна</string>
-  <string name="live_display_auto_summary">Аўтаматычная падладка колеравай тэмпературы экрана пасля заходу і ўзыходу сонца</string>
-  <string name="live_display_off">Адключыць</string>
-  <string name="live_display_off_summary">Адключыць аўтападладку</string>
-  <string name="live_display_day">Дзень</string>
-  <string name="live_display_day_summary">Толькі дзённыя налады</string>
-  <string name="live_display_night">Ноч</string>
-  <string name="live_display_night_summary">Толькі начныя налады</string>
-  <string name="live_display_outdoor">На вуліцы (яскравае сонца)</string>
-  <string name="live_display_outdoor_summary">Толькі вулічны рэжым</string>
-  <string name="live_display_hint">LiveDisplay дапаможа зменшыць глядзельную напругу і палепшыць сон. Націсніце тут, каб паспрабаваць!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Няма падлучаных прылад</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> падлучаная прылада</string>
diff --git a/core/res/res/values-bg/cm_strings.xml b/core/res/res/values-bg/cm_strings.xml
index 0d3d83e7176..2614572f7e4 100644
--- a/core/res/res/values-bg/cm_strings.xml
+++ b/core/res/res/values-bg/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">получете администраторски права</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">За да освободите този екран, докоснете и задръжте бутона назад.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Автоматичен</string>
-  <string name="live_display_auto_summary">Настройва автоматично температурата на цветовете на екрана след залез и изгрев</string>
-  <string name="live_display_off">Изключен</string>
-  <string name="live_display_off_summary">Деактивира всички корекции</string>
-  <string name="live_display_day">Дневен</string>
-  <string name="live_display_day_summary">Само настройки на дневен режим</string>
-  <string name="live_display_night">Нощен</string>
-  <string name="live_display_night_summary">Само настройки на нощен режим</string>
-  <string name="live_display_outdoor">На открито (ярко слънце)</string>
-  <string name="live_display_outdoor_summary">Само настройки на режим на открито</string>
-  <string name="live_display_hint">Използването на адаптивен екран може да помогне за намаляване умората в очите през нощта. Докоснете тук, за да го изпробвате!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Няма свързано устройство</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s </xliff:g> устройството е свързано</string>
diff --git a/core/res/res/values-bn-rBD/cm_strings.xml b/core/res/res/values-bn-rBD/cm_strings.xml
index 94b131173ec..148a78dd934 100644
--- a/core/res/res/values-bn-rBD/cm_strings.xml
+++ b/core/res/res/values-bn-rBD/cm_strings.xml
@@ -126,14 +126,6 @@
   <string name="app_ops_write_mms">এমএমএস বার্তা লিখুন</string>
   <string name="app_ops_write_sms">এসএমএস বার্তা লিখুন</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">স্বয়ংক্রিয়</string>
-  <string name="live_display_off">বন্ধ</string>
-  <string name="live_display_off_summary">সব সামঞ্জস্যগুলি অক্ষম করুন</string>
-  <string name="live_display_day_summary">শুধু দিবা রূপান্তর নির্ধারণ ব্যবহার করুন</string>
-  <string name="live_display_night_summary">কেবল রাতের রূপান্তর নির্ধারণ ব্যবহার করুন</string>
-  <string name="live_display_outdoor">বহিরঙ্গন (উজ্জ্বল সূর্যালোক)</string>
-  <string name="live_display_outdoor_summary">শুধুমাত্র বহিরঙ্গন রূপান্তর নির্ধারণ ব্যবহার করুন</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-br-rFR/cm_strings.xml b/core/res/res/values-br-rFR/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-br-rFR/cm_strings.xml
+++ b/core/res/res/values-br-rFR/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-ca/cm_strings.xml b/core/res/res/values-ca/cm_strings.xml
index ae1997437aa..38d14a514a9 100644
--- a/core/res/res/values-ca/cm_strings.xml
+++ b/core/res/res/values-ca/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">obtenir accés de superusuari</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Per desancorar aquesta pantalla, toca i aguanta el botó Enrera.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automàtic</string>
-  <string name="live_display_auto_summary">Ajusta automàticament la temperatura de color de la pantalla després de la posta de sol i de l\'alba</string>
-  <string name="live_display_off">No</string>
-  <string name="live_display_off_summary">Deshabilita tots els ajustaments</string>
-  <string name="live_display_day">Dia</string>
-  <string name="live_display_day_summary">Utilitza només la configuració de dia</string>
-  <string name="live_display_night">Nit</string>
-  <string name="live_display_night_summary">Utilitza només la configuració de nit</string>
-  <string name="live_display_outdoor">Exterior (sol intens)</string>
-  <string name="live_display_outdoor_summary">Utilitza només la configuració d\'exterior</string>
-  <string name="live_display_hint">LiveDisplay pot ajudar-te a reduir la fatiga ocular i ajudar-te a dormir a la nit. Fes clic aquí per provar-ho!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Cap dispositiu connectat</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> dispositiu connectat</string>
diff --git a/core/res/res/values-cs/cm_strings.xml b/core/res/res/values-cs/cm_strings.xml
index 102069c9834..acfb108a5f0 100644
--- a/core/res/res/values-cs/cm_strings.xml
+++ b/core/res/res/values-cs/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">získat root přístup</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Chcete-li odebrat tuto obrazovku, podržte tlačítko Zpět.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automaticky</string>
-  <string name="live_display_auto_summary">Automaticky upravit teplotu barev obrazovky po západu a východu slunce</string>
-  <string name="live_display_off">Vypnuto</string>
-  <string name="live_display_off_summary">Zakázat všechny úpravy</string>
-  <string name="live_display_day">Den</string>
-  <string name="live_display_day_summary">Nastavení pouze pro den</string>
-  <string name="live_display_night">Noc</string>
-  <string name="live_display_night_summary">Nastavení pouze pro noc</string>
-  <string name="live_display_outdoor">Venku (slunečno)</string>
-  <string name="live_display_outdoor_summary">Nastavení pouze pro venkovní</string>
-  <string name="live_display_hint">LiveDisplay může pomoci proti namáhání očí a také spánku v noci. Dotykem zde tuto funkci můžete vyzkoušet!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Žádné připojené zařízení</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> připojené zařízení</string>
diff --git a/core/res/res/values-cy/cm_strings.xml b/core/res/res/values-cy/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-cy/cm_strings.xml
+++ b/core/res/res/values-cy/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-da/cm_strings.xml b/core/res/res/values-da/cm_strings.xml
index 8ce419239d4..316be92c837 100644
--- a/core/res/res/values-da/cm_strings.xml
+++ b/core/res/res/values-da/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">få root-adgang</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">For at frigøre denne skærm, tryk og hold Tilbage-knappen nede.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automatisk</string>
-  <string name="live_display_auto_summary">Justerer automatisk farvetemperaturen på skærmen efter solnedgang og solopgang</string>
-  <string name="live_display_off">Fra</string>
-  <string name="live_display_off_summary">Deaktivere alle justeringer</string>
-  <string name="live_display_day">Dag</string>
-  <string name="live_display_day_summary">Brug kun dag-indstillinger</string>
-  <string name="live_display_night">Nat</string>
-  <string name="live_display_night_summary">Brug kun nat-indstillinger</string>
-  <string name="live_display_outdoor">Udendørs (stærk sol)</string>
-  <string name="live_display_outdoor_summary">Brug kun udendørsindstillinger</string>
-  <string name="live_display_hint">LiveDisplay kan hjælpe med at reducere overanstrengelse af øjnene og hjælpe dig med at sove om natten. Klik her for at prøve det!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Ingen tilsluttet enhed</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> tilsluttet enhed</string>
diff --git a/core/res/res/values-de/cm_strings.xml b/core/res/res/values-de/cm_strings.xml
index 835b7c92b26..5209a36af4d 100644
--- a/core/res/res/values-de/cm_strings.xml
+++ b/core/res/res/values-de/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">Root-Zugriff zu erhalten</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Zum Lösen dieser Ansicht drücken und halten Sie die Zurück-Taste.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automatisch</string>
-  <string name="live_display_auto_summary">Farbtemperatur des Bildschirms nach Sonnenaufgang und Sonnenuntergang automatisch anpassen</string>
-  <string name="live_display_off">Aus</string>
-  <string name="live_display_off_summary">Alle Anpassungen deaktivieren</string>
-  <string name="live_display_day">Tag</string>
-  <string name="live_display_day_summary">Nur Tag-Modus verwenden</string>
-  <string name="live_display_night">Nacht</string>
-  <string name="live_display_night_summary">Nur Nacht-Modus verwenden</string>
-  <string name="live_display_outdoor">Außen (helle Sonne)</string>
-  <string name="live_display_outdoor_summary">Nur Außen-Modus verwenden</string>
-  <string name="live_display_hint">LiveDisplay kann gegen eine Überanstrengung der Augen und beim Schlafen in der Nacht helfen. Klicken Sie hier, um es auszuprobieren!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Kein verbundenes Gerät</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> verbundenes Gerät</string>
diff --git a/core/res/res/values-el/cm_strings.xml b/core/res/res/values-el/cm_strings.xml
index c9bb0506ce3..a872602970f 100644
--- a/core/res/res/values-el/cm_strings.xml
+++ b/core/res/res/values-el/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">πρόσβαση root</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Για να ξεκαρφιτσώσετε αυτήν την οθόνη, αγγίξτε και κρατήστε πατημένο το πλήκτρο Πίσω.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Αυτόματη</string>
-  <string name="live_display_auto_summary">Αυτόματη ρύθμιση της θερμοκρασίας χρώματος της οθόνης μετά το ηλιοβασίλεμα και την ανατολή του ηλίου</string>
-  <string name="live_display_off">Απενεργοποιημένη</string>
-  <string name="live_display_off_summary">Απενεργοποίηση όλων των ρυθμίσεων</string>
-  <string name="live_display_day">Ημέρα</string>
-  <string name="live_display_day_summary">Χρήση μόνο των ρυθμίσεων ημέρας</string>
-  <string name="live_display_night">Νύχτα</string>
-  <string name="live_display_night_summary">Χρήση μόνο των ρυθμίσεων νύχτας</string>
-  <string name="live_display_outdoor">Εξωτερικός χώρος (ήλιος)</string>
-  <string name="live_display_outdoor_summary">Χρήση μόνο των ρυθμίσεων εξωτερικού χώρου</string>
-  <string name="live_display_hint">Το LiveDisplay μπορεί να βοηθήσει στη μείωση της κόπωσης των ματιών και να σας βοηθήσει να κοιμηθείτε τη νύχτα. Κάντε κλικ εδώ για να το δοκιμάσετε!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Καμία συνδεδεμένη συσκευή</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> συνδεδεμένη συσκευή</string>
diff --git a/core/res/res/values-en-rAU/cm_strings.xml b/core/res/res/values-en-rAU/cm_strings.xml
index 5d4d9d6462d..1ccf5e4f82e 100644
--- a/core/res/res/values-en-rAU/cm_strings.xml
+++ b/core/res/res/values-en-rAU/cm_strings.xml
@@ -142,18 +142,6 @@
   <string name="app_ops_write_sms">write an SMS message</string>
   <string name="app_ops_su">get root access</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automatic</string>
-  <string name="live_display_auto_summary">Automatically adjust color temperature of screen after sunset and sunrise</string>
-  <string name="live_display_off">Off</string>
-  <string name="live_display_off_summary">Disable all adjustments</string>
-  <string name="live_display_day">Day</string>
-  <string name="live_display_day_summary">Use day settings only</string>
-  <string name="live_display_night">Night</string>
-  <string name="live_display_night_summary">Use night settings only</string>
-  <string name="live_display_outdoor">Outdoor (bright sun)</string>
-  <string name="live_display_outdoor_summary">Use outdoor settings only</string>
-  <string name="live_display_hint">LiveDisplay can help reduce eyestrain and help you sleep at night. Click here to try it out!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">No connected device</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> connected device</string>
diff --git a/core/res/res/values-en-rGB/cm_strings.xml b/core/res/res/values-en-rGB/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-en-rGB/cm_strings.xml
+++ b/core/res/res/values-en-rGB/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-en-rIN/cm_strings.xml b/core/res/res/values-en-rIN/cm_strings.xml
index ccbb24ee055..7a726eb89a0 100644
--- a/core/res/res/values-en-rIN/cm_strings.xml
+++ b/core/res/res/values-en-rIN/cm_strings.xml
@@ -167,18 +167,6 @@
   <string name="app_ops_su">get root access</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">To unpin this screen, touch and hold the Back button.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automatic</string>
-  <string name="live_display_auto_summary">Automatically adjust color temperature of screen after sunset and sunrise</string>
-  <string name="live_display_off">Off</string>
-  <string name="live_display_off_summary">Disable all adjustments</string>
-  <string name="live_display_day">Day</string>
-  <string name="live_display_day_summary">Use day settings only</string>
-  <string name="live_display_night">Night</string>
-  <string name="live_display_night_summary">Use night settings only</string>
-  <string name="live_display_outdoor">Outdoor (bright sun)</string>
-  <string name="live_display_outdoor_summary">Use outdoor settings only</string>
-  <string name="live_display_hint">LiveDisplay can help reduce eyestrain and help you sleep at night. Click here to try it out!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">No connected device</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> connected device</string>
diff --git a/core/res/res/values-en-rPT/cm_strings.xml b/core/res/res/values-en-rPT/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-en-rPT/cm_strings.xml
+++ b/core/res/res/values-en-rPT/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-eo/cm_strings.xml b/core/res/res/values-eo/cm_strings.xml
index 82f43f69d10..5489b7a1748 100644
--- a/core/res/res/values-eo/cm_strings.xml
+++ b/core/res/res/values-eo/cm_strings.xml
@@ -147,18 +147,6 @@
   <string name="app_ops_su">akiri radikuzantajn permesojn</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Por malŝlosi tiun ekranon, tuŝetu kaj tenu la Reen butonon.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Aŭtomata</string>
-  <string name="live_display_auto_summary">Aŭtomate alĝustigi kolortemperaturon de la ekrano post sunsubiro kaj suniĝo</string>
-  <string name="live_display_off">For</string>
-  <string name="live_display_off_summary">Malŝalti ĉiujn ĝustigojn</string>
-  <string name="live_display_day">Tago</string>
-  <string name="live_display_day_summary">Uzi nur tagajn agordojn</string>
-  <string name="live_display_night">Nokto</string>
-  <string name="live_display_night_summary">Uzi nur noktajn agordojn</string>
-  <string name="live_display_outdoor">Ekstere (brila suno)</string>
-  <string name="live_display_outdoor_summary">Uzi nur eksterajn parametrojn</string>
-  <string name="live_display_hint">LiveDisplay povas helpi vin malgrandigi okulo-streĉon nokte. Alklaku tie por provi!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Neniu konektata aparato</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> konektita aparato</string>
diff --git a/core/res/res/values-es-rMX/cm_strings.xml b/core/res/res/values-es-rMX/cm_strings.xml
index 8c48bc171f5..f1ca0930012 100644
--- a/core/res/res/values-es-rMX/cm_strings.xml
+++ b/core/res/res/values-es-rMX/cm_strings.xml
@@ -73,7 +73,6 @@
   <string name="app_ops_get_accounts">obtener cuentas del dispositivo</string>
   <string name="app_ops_wifi_change">cambiar el estado de Wi-Fi</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-es-rUS/cm_strings.xml b/core/res/res/values-es-rUS/cm_strings.xml
index 824183f0f3c..74e70ab2500 100644
--- a/core/res/res/values-es-rUS/cm_strings.xml
+++ b/core/res/res/values-es-rUS/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">obtener acceso root</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Para desanclar esta pantalla, mantén pulsado el botón Atrás.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automático</string>
-  <string name="live_display_auto_summary">Ajustar automáticamente la temperatura del color de pantalla con el amanecer y el anochecer</string>
-  <string name="live_display_off">Desactivado</string>
-  <string name="live_display_off_summary">Deshabilitar todos los ajustes</string>
-  <string name="live_display_day">Día</string>
-  <string name="live_display_day_summary">Utilizar solo los ajustes de día</string>
-  <string name="live_display_night">Noche</string>
-  <string name="live_display_night_summary">Utilizar solo los ajustes de noche</string>
-  <string name="live_display_outdoor">Al aire libre (luz del sol)</string>
-  <string name="live_display_outdoor_summary">Utilizar solo los ajustes de aire libre</string>
-  <string name="live_display_hint">LiveDisplay puede ayudar a reducir la fatiga visual y a dormir por la noche. ¡Haz clic aquí para probarlo!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Ningún dispositivo conectado</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> dispositivo conectado</string>
diff --git a/core/res/res/values-es/cm_strings.xml b/core/res/res/values-es/cm_strings.xml
index dd4d627246c..e602fd4cb04 100644
--- a/core/res/res/values-es/cm_strings.xml
+++ b/core/res/res/values-es/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">obtener acceso administrativo</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Para liberar esta pantalla, mantén pulsado el botón Atrás.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automático</string>
-  <string name="live_display_auto_summary">Ajustar automáticamente la temperatura del color de pantalla con el amanecer y el anochecer</string>
-  <string name="live_display_off">Desactivado</string>
-  <string name="live_display_off_summary">Desactivar todos los ajustes</string>
-  <string name="live_display_day">Día</string>
-  <string name="live_display_day_summary">Utilizar solo los ajustes de día</string>
-  <string name="live_display_night">Noche</string>
-  <string name="live_display_night_summary">Utilizar solo los ajustes de noche</string>
-  <string name="live_display_outdoor">Al aire libre (luz del sol)</string>
-  <string name="live_display_outdoor_summary">Utilizar solo los ajustes al aire libre</string>
-  <string name="live_display_hint">LiveDisplay puede reducir la fatiga visual y ayudar a dormir por la noche. ¡Toca aquí para probarlo!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Ningún dispositivo conectado</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> dispositivo conectado</string>
diff --git a/core/res/res/values-et-rEE/cm_strings.xml b/core/res/res/values-et-rEE/cm_strings.xml
index cd3a2c1dcde..99ceaa9fb9c 100644
--- a/core/res/res/values-et-rEE/cm_strings.xml
+++ b/core/res/res/values-et-rEE/cm_strings.xml
@@ -151,18 +151,6 @@
   <string name="app_ops_su">saada root ligipääsu</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Selle ekraani vabastamiseks puudutage ja hoidke all Tagasi nuppu.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automaatne</string>
-  <string name="live_display_auto_summary">Automaatselt reguleeri ekraani värvitemperaturri pärast päikeseloojangut ja -tõusu</string>
-  <string name="live_display_off">Väljas</string>
-  <string name="live_display_off_summary">Keela kõik kohandused</string>
-  <string name="live_display_day">Päev</string>
-  <string name="live_display_day_summary">Kasuta ainult päeva seadeid</string>
-  <string name="live_display_night">Öö</string>
-  <string name="live_display_night_summary">Kasuta ainult öö seadeid</string>
-  <string name="live_display_outdoor">Õues (ere päike)</string>
-  <string name="live_display_outdoor_summary">Kasuta ainult õue seadeid</string>
-  <string name="live_display_hint">LiveDisplay võimaldab vähendada silmade pinget ja lasta sul öösel magada. Kliki siin et seda proovida!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Pole ühtegi ühendatud seadet</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ühendatud seade</string>
diff --git a/core/res/res/values-eu-rES/cm_strings.xml b/core/res/res/values-eu-rES/cm_strings.xml
index d12e0713d06..52d8b2046b7 100644
--- a/core/res/res/values-eu-rES/cm_strings.xml
+++ b/core/res/res/values-eu-rES/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">root sarbidea eskuratu</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Pantaila hau desiltzatzeko sakatu eta mantendu atzera botoia.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automatikoa</string>
-  <string name="live_display_auto_summary">Doitu automatikoki pantailaren kolore tenperatura ilunabarra eta egunsentiaren ostean</string>
-  <string name="live_display_off">Ez</string>
-  <string name="live_display_off_summary">Ezgaitu doitze guztiak</string>
-  <string name="live_display_day">Eguna</string>
-  <string name="live_display_day_summary">Erabili egun ezarpenak besterik ez</string>
-  <string name="live_display_night">Gaua</string>
-  <string name="live_display_night_summary">Erabili gau ezarpenak besterik ez</string>
-  <string name="live_display_outdoor">Kalean (eguzkipean)</string>
-  <string name="live_display_outdoor_summary">Erabili kaleko ezarpenak besterik ez</string>
-  <string name="live_display_hint">LiveDisplayk begi nekea gutxitu eta gauez lo egiten lagundu dezake. Probatu ezazu!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Ez da gailurik konektatu</string>
   <string name="tethered_notification_one_device_message">gailu <xliff:g id="count">%1$s</xliff:g> konektatuta</string>
diff --git a/core/res/res/values-fa/cm_strings.xml b/core/res/res/values-fa/cm_strings.xml
index 9c955370834..e8278c21aec 100644
--- a/core/res/res/values-fa/cm_strings.xml
+++ b/core/res/res/values-fa/cm_strings.xml
@@ -151,18 +151,6 @@
   <string name="app_ops_su">دریافت دسترسی روت</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">برای از سنجاق درآوردن این صفحه، دکمه بازگشت را زده و نگه دارید.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">خودکار</string>
-  <string name="live_display_auto_summary">تنظیم خودکار دمای رنگ صفحه بعد از طلوع و غروب خورشید</string>
-  <string name="live_display_off">خاموش</string>
-  <string name="live_display_off_summary">غیرفعال کردن همه تنظیمات</string>
-  <string name="live_display_day">روز</string>
-  <string name="live_display_day_summary">فقط استفاده از تنظیمات روز</string>
-  <string name="live_display_night">شب</string>
-  <string name="live_display_night_summary">فقط استفاده از تنظیمات شب</string>
-  <string name="live_display_outdoor">فضای باز (نور خورشید)</string>
-  <string name="live_display_outdoor_summary">فقط استفاده از تنظیمات فضای باز</string>
-  <string name="live_display_hint">نمایش پویا کمک می‌کند چشم‌هایتان کم‌تر خسته شده و شب راحت‌تر به خواب بروید. برای امتحان آن اینجا کلیک کنید!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">هیچ دستگاه متصلی وجود ندارد</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s </xliff:g> دستگاه متصل</string>
diff --git a/core/res/res/values-fi/cm_strings.xml b/core/res/res/values-fi/cm_strings.xml
index db6e4d624f8..db3b930e441 100644
--- a/core/res/res/values-fi/cm_strings.xml
+++ b/core/res/res/values-fi/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">pääkäyttäjän oikeudet</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Irrottaaksesi tämän näytön, paina ja pidä Takasin-näppäintä pohjassa.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automaattinen</string>
-  <string name="live_display_auto_summary">Säädä näytön värilämpötilaa automaattisesti auringonlaskun ja -nousun jälkeen</string>
-  <string name="live_display_off">Pois käytöstä</string>
-  <string name="live_display_off_summary">Poista kaikki mukautukset</string>
-  <string name="live_display_day">Päivä</string>
-  <string name="live_display_day_summary">Käytä vain päiväasetusta</string>
-  <string name="live_display_night">Yö</string>
-  <string name="live_display_night_summary">Käytä vain yöasetusta</string>
-  <string name="live_display_outdoor">Ulkoilma (kirkas aurinko)</string>
-  <string name="live_display_outdoor_summary">Käytä vain ulkoilma-asetusta</string>
-  <string name="live_display_hint">LiveDisplay voi vähentää silmien rasitusta ja auttaa nukkumaan öisin. Kokeile sitä painamalla tästä!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Ei kytkettyä laitetta</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> yhdistetty laite</string>
diff --git a/core/res/res/values-fil-rPH/cm_strings.xml b/core/res/res/values-fil-rPH/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-fil-rPH/cm_strings.xml
+++ b/core/res/res/values-fil-rPH/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-fr-rCA/cm_strings.xml b/core/res/res/values-fr-rCA/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-fr-rCA/cm_strings.xml
+++ b/core/res/res/values-fr-rCA/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-fr/cm_strings.xml b/core/res/res/values-fr/cm_strings.xml
index 511b29ab9b2..a4be3cff3f1 100644
--- a/core/res/res/values-fr/cm_strings.xml
+++ b/core/res/res/values-fr/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">obtenir l\'accès root</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Pour déverrouiller l\'écran, appuyez et maintenez le bouton Retour.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automatique</string>
-  <string name="live_display_auto_summary">Ajuster automatiquement la température des couleurs de l\'écran après le coucher et le lever du soleil</string>
-  <string name="live_display_off">Désactivé</string>
-  <string name="live_display_off_summary">Désactiver tous les réglages</string>
-  <string name="live_display_day">Jour</string>
-  <string name="live_display_day_summary">Utiliser uniquement les paramètres de jour</string>
-  <string name="live_display_night">Nuit</string>
-  <string name="live_display_night_summary">Utiliser uniquement les paramètres de nuit</string>
-  <string name="live_display_outdoor">Extérieur (plein soleil)</string>
-  <string name="live_display_outdoor_summary">Utiliser uniquement les paramètres extérieurs</string>
-  <string name="live_display_hint">LiveDisplay peut aider à réduire la fatigue oculaire et vous aider à dormir la nuit. Appuyez ici pour l\'essayer !</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Aucun appareil connecté</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> appareil connecté</string>
diff --git a/core/res/res/values-frp-rIT/cm_strings.xml b/core/res/res/values-frp-rIT/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-frp-rIT/cm_strings.xml
+++ b/core/res/res/values-frp-rIT/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-fy-rNL/cm_strings.xml b/core/res/res/values-fy-rNL/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-fy-rNL/cm_strings.xml
+++ b/core/res/res/values-fy-rNL/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-gd-rGB/cm_strings.xml b/core/res/res/values-gd-rGB/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-gd-rGB/cm_strings.xml
+++ b/core/res/res/values-gd-rGB/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-gl-rES/cm_strings.xml b/core/res/res/values-gl-rES/cm_strings.xml
index cf6768b9443..64414a07e57 100644
--- a/core/res/res/values-gl-rES/cm_strings.xml
+++ b/core/res/res/values-gl-rES/cm_strings.xml
@@ -156,18 +156,6 @@
   <string name="app_ops_su">Obter acceso como superusuario</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Para deixar de fixar esta pantalla, mantén tocado o botón Atrás.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automático</string>
-  <string name="live_display_auto_summary">Axustar automaticamente os tons da pantalla ao amencer e o solpor</string>
-  <string name="live_display_off">Apagado</string>
-  <string name="live_display_off_summary">Desactivar todos os axustes</string>
-  <string name="live_display_day">Día</string>
-  <string name="live_display_day_summary">Utilizar tan só os axustes de día</string>
-  <string name="live_display_night">Noite</string>
-  <string name="live_display_night_summary">Utilizar tan só os axustes de noite</string>
-  <string name="live_display_outdoor">Exteriores (iluminado)</string>
-  <string name="live_display_outdoor_summary">Utilizar tan só os axustes de exteriores</string>
-  <string name="live_display_hint">O modo LiveDisplay pode axudar coa dor de ollos e a conciliar o sono. Toca aquí para probalo!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Dispositivo non conectado</string>
   <string name="tethered_notification_one_device_message">Dispositivo <xliff:g id="count">%1$s</xliff:g> conectado</string>
diff --git a/core/res/res/values-gu-rIN/cm_strings.xml b/core/res/res/values-gu-rIN/cm_strings.xml
index e763eabfa23..62072a093ec 100644
--- a/core/res/res/values-gu-rIN/cm_strings.xml
+++ b/core/res/res/values-gu-rIN/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">રૂટ ઍક્સેસ મેળવી</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">આ સ્ક્રીન અનપિન કરવા માટે બૅક બટન પર ટચ કરી પકડી રાખો.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">સ્વચલિત</string>
-  <string name="live_display_auto_summary">સૂર્યોદય અને સૂર્યાસ્ત પછી સ્ક્રીનના રંગ તાપમાનને સ્વયંચાલિત રીતે સમાયોજિત કરો</string>
-  <string name="live_display_off">બંધ</string>
-  <string name="live_display_off_summary">તમામ ફેરફારો અક્ષમ કરો</string>
-  <string name="live_display_day">દિવસ</string>
-  <string name="live_display_day_summary">ફકત ડે સેટિંગ્સનો ઉપયોગ કરો</string>
-  <string name="live_display_night">રાત્રિ</string>
-  <string name="live_display_night_summary">ફકત નાઇટ સેટિંગ્સનો ઉપયોગ કરો</string>
-  <string name="live_display_outdoor">આઉટડોર (તેજ તડકો)</string>
-  <string name="live_display_outdoor_summary">ફકત આઉટડોર સેટિંગ્સનો ઉપયોગ કરો</string>
-  <string name="live_display_hint">લાઇવડિસ્પ્લેથી આંખો પરની તાણ ઘટાડી શકાય છે અને તમને રાતે સૂવામાં મદદરૂપ થઈ શકે. અજમાવવા અહીં ક્લિક કરો!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">કોઇ ડિવાઇસ કનેક્ટ થયેલ નથી</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ડિવાઇસ કનેક્ટ થયેલ છે</string>
diff --git a/core/res/res/values-hi/cm_strings.xml b/core/res/res/values-hi/cm_strings.xml
index 5efa3bf7f2c..65e20c40df0 100644
--- a/core/res/res/values-hi/cm_strings.xml
+++ b/core/res/res/values-hi/cm_strings.xml
@@ -149,18 +149,6 @@
   <string name="app_ops_su">मूल तक पहुँच प्राप्त करें</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">इस स्क्रीन को अनपिन करने के लिए पीछे के बटन को कुछ देर के लिए छुएँ।</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">स्वचालित</string>
-  <string name="live_display_auto_summary">सूर्यास्त और सूर्योदय के बाद अपने आप ही स्क्रीन के रंग तापमान को समायोजित करें</string>
-  <string name="live_display_off">बंद</string>
-  <string name="live_display_off_summary">सभी समायोजनों को अक्षम करें</string>
-  <string name="live_display_day">दिन</string>
-  <string name="live_display_day_summary">केवल दिन की सेटिंग का उपयोग करें</string>
-  <string name="live_display_night">रात</string>
-  <string name="live_display_night_summary">केवल रात की सेटिंग का उपयोग करें</string>
-  <string name="live_display_outdoor">बाहर (तेज़ धूप)</string>
-  <string name="live_display_outdoor_summary">केवल बाहर की सेटिंग का उपयोग करें</string>
-  <string name="live_display_hint">लाइवडिस्प्ले आँखों पर पड़नेवाले दबाव को घटा सकता है और आपको रात को अच्छी तरह से सोने में मदद कर सकता है। इसे आज़माने के लिए यहाँ क्लिक करें।</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">कोई जुड़ा हुआ उपकरण नहीं है</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> जुड़ा हुआ उपकरण</string>
diff --git a/core/res/res/values-hr/cm_strings.xml b/core/res/res/values-hr/cm_strings.xml
index f71bc0ebec0..75abf479414 100644
--- a/core/res/res/values-hr/cm_strings.xml
+++ b/core/res/res/values-hr/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">Zatraži root pristup</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Za otkvačiti ovaj zaslon dodirnite i držite tipku za natrag</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automatski</string>
-  <string name="live_display_auto_summary">Automatski prilagodi temperaturu boje zaslona nakon zalaska i izlaska sunca</string>
-  <string name="live_display_off">Isključeno</string>
-  <string name="live_display_off_summary">Onemogući sva prilagođavanja</string>
-  <string name="live_display_day">Dan</string>
-  <string name="live_display_day_summary">Koristi samo postavke za dan</string>
-  <string name="live_display_night">Noć</string>
-  <string name="live_display_night_summary">Koristi samo postavke za noć</string>
-  <string name="live_display_outdoor">Vani (jako sunce)</string>
-  <string name="live_display_outdoor_summary">Koristi samo postavke za van</string>
-  <string name="live_display_hint">LiveDisplay može smanjiti naprezanje očiju i poboljšati san. Dodirnite ovdje ako ga želite isprobati!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nema spojenih uređaja</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> povezani uređaj</string>
diff --git a/core/res/res/values-hu/cm_strings.xml b/core/res/res/values-hu/cm_strings.xml
index e04646e8c7a..212a0c451e2 100644
--- a/core/res/res/values-hu/cm_strings.xml
+++ b/core/res/res/values-hu/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">rendszergazdai jogosultság szerzése</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Képernyő rögzítésének feloldásához érintse meg és tartsa nyomva a Vissza gombot.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automatikus</string>
-  <string name="live_display_auto_summary">Automatikusan beállítja a képernyő színhőmérsékletét napnyugta és napkelte után</string>
-  <string name="live_display_off">Ki</string>
-  <string name="live_display_off_summary">Az összes beállítás kikapcsolása</string>
-  <string name="live_display_day">Nappal</string>
-  <string name="live_display_day_summary">Csak a nappali beállítások használata</string>
-  <string name="live_display_night">Éjszaka</string>
-  <string name="live_display_night_summary">Csak az éjszakai béállítások használata</string>
-  <string name="live_display_outdoor">Kültéri (erős napfény)</string>
-  <string name="live_display_outdoor_summary">Csak a kültéri beállítások használata</string>
-  <string name="live_display_hint">A LiveDisplay segíthet a szemek terhelésének csökkentésében és a jobb éjszakai alvásban. Kattintson ide, hogy kipróbálja!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nincs csatlakoztatott készülék</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> csatlakoztatott eszköz</string>
diff --git a/core/res/res/values-hy-rAM/cm_strings.xml b/core/res/res/values-hy-rAM/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-hy-rAM/cm_strings.xml
+++ b/core/res/res/values-hy-rAM/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-in/cm_strings.xml b/core/res/res/values-in/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-in/cm_strings.xml
+++ b/core/res/res/values-in/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-is-rIS/cm_strings.xml b/core/res/res/values-is-rIS/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-is-rIS/cm_strings.xml
+++ b/core/res/res/values-is-rIS/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-it/cm_strings.xml b/core/res/res/values-it/cm_strings.xml
index 1bd1c0f89ad..1d8fe78517f 100644
--- a/core/res/res/values-it/cm_strings.xml
+++ b/core/res/res/values-it/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">Ottieni accesso root</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Per sbloccare questo schermo, tocca e tieni premuto il pulsante indietro.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automatico</string>
-  <string name="live_display_auto_summary">Regola automaticamente la temperatura del colore dello schermo dopo il tramonto e l\'alba</string>
-  <string name="live_display_off">Disattivato</string>
-  <string name="live_display_off_summary">Disattiva tutte le regolazioni</string>
-  <string name="live_display_day">Giorno</string>
-  <string name="live_display_day_summary">Usa solo impostazioni giorno</string>
-  <string name="live_display_night">Notte</string>
-  <string name="live_display_night_summary">Utilizza solo impostazioni notte</string>
-  <string name="live_display_outdoor">All\'aperto (sole)</string>
-  <string name="live_display_outdoor_summary">Utilizza solo impostazioni all\'aperto</string>
-  <string name="live_display_hint">LiveDisplay aiuta a ridurre l\'affaticamento degli occhi e aiuta a dormire di notte. Clicca per provarlo!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nessun dispositivo connesso</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> dispositivo connesso</string>
diff --git a/core/res/res/values-iw/cm_strings.xml b/core/res/res/values-iw/cm_strings.xml
index d7b63825429..291baccf90e 100644
--- a/core/res/res/values-iw/cm_strings.xml
+++ b/core/res/res/values-iw/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">קבלת גישת שורש (Root)</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">כדי לבטל נעיצת מסך זה, גע והחזק בלחצן \"הקודם\".</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">אוטומטי</string>
-  <string name="live_display_auto_summary">התאם אוטומטית את טמפרטורת הצבע של המסך לאחר הזריחה והשקיעה</string>
-  <string name="live_display_off">כבוי</string>
-  <string name="live_display_off_summary">השבת את כל ההתאמות</string>
-  <string name="live_display_day">יום</string>
-  <string name="live_display_day_summary">השתמש בהגדרות יום בלבד</string>
-  <string name="live_display_night">לילה</string>
-  <string name="live_display_night_summary">השתמש בהגדרות לילה בלבד</string>
-  <string name="live_display_outdoor">בחוץ (שמש בהירה)</string>
-  <string name="live_display_outdoor_summary">השתמש בהגדרות חוץ בלבד</string>
-  <string name="live_display_hint">LiveDisplay יכולה למזער את עייפות העין ולעזור לך לישון בלילה. לחץ כאן כדי לנסות!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">אין מכשירים מחוברים</string>
   <string name="tethered_notification_one_device_message">מכשיר <xliff:g id="count">%1$s</xliff:g> מחובר</string>
diff --git a/core/res/res/values-ja/cm_strings.xml b/core/res/res/values-ja/cm_strings.xml
index c307caf8c96..511f5213dd9 100644
--- a/core/res/res/values-ja/cm_strings.xml
+++ b/core/res/res/values-ja/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">ルートアクセスの取得</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">この画面の固定を解除するには、戻るボタンを長押しします。</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">自動</string>
-  <string name="live_display_auto_summary">太陽の動きに合わせて画面の色温度を自動的に調整する</string>
-  <string name="live_display_off">OFF</string>
-  <string name="live_display_off_summary">すべての調整を無効にする</string>
-  <string name="live_display_day">昼</string>
-  <string name="live_display_day_summary">昼の設定のみを使用する</string>
-  <string name="live_display_night">夜</string>
-  <string name="live_display_night_summary">夜の設定のみを使用する</string>
-  <string name="live_display_outdoor">屋外（日光）</string>
-  <string name="live_display_outdoor_summary">屋外の設定のみを使用する</string>
-  <string name="live_display_hint">LiveDisplayは目を疲れにくくし、夜の睡眠を邪魔しません。ここをタップして試してみてください。</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">接続しているデバイスはありません</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g>台のデバイスが接続しています</string>
diff --git a/core/res/res/values-ka-rGE/cm_strings.xml b/core/res/res/values-ka-rGE/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-ka-rGE/cm_strings.xml
+++ b/core/res/res/values-ka-rGE/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-kk-rKZ/cm_strings.xml b/core/res/res/values-kk-rKZ/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-kk-rKZ/cm_strings.xml
+++ b/core/res/res/values-kk-rKZ/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-km-rKH/cm_strings.xml b/core/res/res/values-km-rKH/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-km-rKH/cm_strings.xml
+++ b/core/res/res/values-km-rKH/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-kn-rIN/cm_strings.xml b/core/res/res/values-kn-rIN/cm_strings.xml
index 7d08d580710..8497c9890c0 100644
--- a/core/res/res/values-kn-rIN/cm_strings.xml
+++ b/core/res/res/values-kn-rIN/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">ರೂಟ್ ಪ್ರವೇಶ ಪಡೆ</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">ಪರದೆಯನ್ನು ಅನ್‍ಪಿನ್‍ಮಾಡಲು, ಹಿಂದೆ ಬಟನ್‍ ಸ್ಪರ್ಶಿಸಿ ಹಿಡಿಯಿರಿ.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">ಸ್ವಯಂಚಾಲಿತ</string>
-  <string name="live_display_auto_summary">ಸೂರ್ಯಾಸ್ತ ಅಥವ ಸೂರ್ಯೋದಯದ ನಂತರ ಪರದೆಯ ಬಣ್ಣ ಉಷ್ಣಾಂಶವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸರಿಹೊಂದಿಸು</string>
-  <string name="live_display_off">ಆಫ್</string>
-  <string name="live_display_off_summary">ಎಲ್ಲಾ ಹೊಂದಾಣಿಕೆಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು</string>
-  <string name="live_display_day">ದಿನ</string>
-  <string name="live_display_day_summary">ದಿನ ಸೆಟ್ಟಿಂಗ್ಸನ್ನು ಮಾತ್ರ ಉಪಯೋಗಿಸು</string>
-  <string name="live_display_night">ರಾತ್ರಿ</string>
-  <string name="live_display_night_summary">ರಾತ್ರಿ ಸೆಟ್ಟಿಂಗ್ಸನ್ನು ಮಾತ್ರ ಉಪಯೋಗಿಸು</string>
-  <string name="live_display_outdoor">ಹೊರಾಂಗಣ (ಪ್ರಕಾಶಮಾನ ಸೂರ್ಯ)</string>
-  <string name="live_display_outdoor_summary">ಹೊರಾಂಗಣ ಸೆಟ್ಟಿಂಗ್ಸನ್ನು ಮಾತ್ರ ಉಪಯೋಗಿಸು</string>
-  <string name="live_display_hint">ಲೈವ್ ಡಿಸ್ಪ್ಲೆ ನಿಮ್ಮ ಕಣ್ಣಿನ ಆಯಾಸವನ್ನು ಕಡಿಮೆಮಾಡಿ ರಾತ್ರಿ ಮಲಗಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ. ಇದನ್ನು ಪ್ರಯತ್ನಿಸಲು ಇಲ್ಲಿ ಒತ್ತಿ!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">ಯಾವುದೇ ಸಂಪರ್ಕಗೊಂಡ ಸಾಧನವಿಲ್ಲ</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ಸಂಪರ್ಕಗೊಳಿಸಿದ ಸಾಧನ</string>
diff --git a/core/res/res/values-ko/cm_strings.xml b/core/res/res/values-ko/cm_strings.xml
index 6762af18ff4..697df4b85ec 100644
--- a/core/res/res/values-ko/cm_strings.xml
+++ b/core/res/res/values-ko/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">루트 권한 얻기</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">화면 고정을 해제하려면 뒤로 버튼을 계속 누르세요</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">자동</string>
-  <string name="live_display_auto_summary">일출 및 일몰 후 화면의 색 온도를 자동으로 조정</string>
-  <string name="live_display_off">끄기</string>
-  <string name="live_display_off_summary">모든 조정 사용 안 함</string>
-  <string name="live_display_day">주간</string>
-  <string name="live_display_day_summary">주간 설정만으로 사용</string>
-  <string name="live_display_night">야간</string>
-  <string name="live_display_night_summary">야간 설정만으로 사용</string>
-  <string name="live_display_outdoor">야외 (밝은 햇빛)</string>
-  <string name="live_display_outdoor_summary">야외 설정만으로 사용</string>
-  <string name="live_display_hint">LiveDisplay는 눈의 피로를 줄이고 밤에 수면을 돕습니다. 적용하려면 클릭하십시오!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">연결된 기기 없음</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g>대의 기기가 연결되어 있습니다</string>
diff --git a/core/res/res/values-ku/cm_strings.xml b/core/res/res/values-ku/cm_strings.xml
index 12d8ec19206..eb98dc24172 100644
--- a/core/res/res/values-ku/cm_strings.xml
+++ b/core/res/res/values-ku/cm_strings.xml
@@ -141,15 +141,6 @@
   <string name="app_ops_write_sms">نوسینی نامەی SMS</string>
   <string name="app_ops_su">بەدەستهێنانی ڕێگەپێدانی ڕۆت</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">خۆکارانه‌</string>
-  <string name="live_display_off">کوژانه‌وه‌</string>
-  <string name="live_display_off_summary">لەکارخستنی هەموو ڕێکخستنەکان</string>
-  <string name="live_display_day">ڕۆژ</string>
-  <string name="live_display_day_summary">بەکارهێنانی ڕێکخستنی ڕۆژ تەنها</string>
-  <string name="live_display_night">شەو</string>
-  <string name="live_display_night_summary">تەنها ڕێکخستنی شەو بەکاربهێنە</string>
-  <string name="live_display_outdoor">دەرەوە (ڕۆشنای خۆر)</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">ئامێر پەیوەست نەکراوە</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ئامێر پەیوەستکراوە</string>
diff --git a/core/res/res/values-ky-rKG/cm_strings.xml b/core/res/res/values-ky-rKG/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-ky-rKG/cm_strings.xml
+++ b/core/res/res/values-ky-rKG/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-lb/cm_strings.xml b/core/res/res/values-lb/cm_strings.xml
index f977c485557..0bfbe686b16 100644
--- a/core/res/res/values-lb/cm_strings.xml
+++ b/core/res/res/values-lb/cm_strings.xml
@@ -152,18 +152,6 @@
   <string name="app_ops_su">Root-Accès kréien</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Fir dëse Schierm lasszeléisen, dréck den Zréck-Knäppchen an hal e gedréckt.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automatesch</string>
-  <string name="live_display_auto_summary">Faarftemperatur automatesch dem Sonnenënnergank a Sonnenopgank upassen</string>
-  <string name="live_display_off">Aus</string>
-  <string name="live_display_off_summary">All Upassungen desaktivéieren</string>
-  <string name="live_display_day">Dag</string>
-  <string name="live_display_day_summary">Just Dagesmodus benotzen</string>
-  <string name="live_display_night">Nuecht</string>
-  <string name="live_display_night_summary">Just Nuetsmodus benotzen</string>
-  <string name="live_display_outdoor">Baussen (hell Sonn)</string>
-  <string name="live_display_outdoor_summary">Just Baussemodus benotzen</string>
-  <string name="live_display_hint">LiveDisplay ka géint Iwwerustrengung vun den Aen a beim Schlofen an der Nuecht hëllefen. Dréck hei, fir et auszeprobéieren!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Kee connectéierten Apparat</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> connectéierten Apparat</string>
diff --git a/core/res/res/values-lo-rLA/cm_strings.xml b/core/res/res/values-lo-rLA/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-lo-rLA/cm_strings.xml
+++ b/core/res/res/values-lo-rLA/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-lt/cm_strings.xml b/core/res/res/values-lt/cm_strings.xml
index 599d2b9fc26..d30676fe0a5 100644
--- a/core/res/res/values-lt/cm_strings.xml
+++ b/core/res/res/values-lt/cm_strings.xml
@@ -151,18 +151,6 @@
   <string name="app_ops_su">gauti „Root“ prieigą</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Kad atsegtumėte šį ekraną palieskite ir laikykite mygtuką atgal.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automatinis</string>
-  <string name="live_display_auto_summary">Automatiškai sureguliuoti ekrano spalvos temperatūrą po saulėlydžio ir saulėtekio</string>
-  <string name="live_display_off">Išjungta</string>
-  <string name="live_display_off_summary">Neleisti visų reguliavimų</string>
-  <string name="live_display_day">Diena</string>
-  <string name="live_display_day_summary">Naudoti tik dienos nustatymus</string>
-  <string name="live_display_night">Naktis</string>
-  <string name="live_display_night_summary">Naudoti tik nakties nustatymus</string>
-  <string name="live_display_outdoor">Laukas (ryški saulė)</string>
-  <string name="live_display_outdoor_summary">Naudoti tik lauko nustatymus</string>
-  <string name="live_display_hint">„LiveDisplay“ gali padėti sumažinti akių įtampą ir padėti jums užmigti naktį. Spauskite čia, kad jį išbandyti!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nėra prijungto įrenginio</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> prijungtas įrenginys</string>
diff --git a/core/res/res/values-lv/cm_strings.xml b/core/res/res/values-lv/cm_strings.xml
index e4fbd7c10a7..feda39b0b7f 100644
--- a/core/res/res/values-lv/cm_strings.xml
+++ b/core/res/res/values-lv/cm_strings.xml
@@ -138,7 +138,6 @@
   <string name="app_ops_write_sms">rakstīt īsziņu</string>
   <string name="app_ops_su">saņemt root piekļuvi</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nav pievienota ierīce</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s </xliff:g> pievienota ierīce</string>
diff --git a/core/res/res/values-mk-rMK/cm_strings.xml b/core/res/res/values-mk-rMK/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-mk-rMK/cm_strings.xml
+++ b/core/res/res/values-mk-rMK/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-ml-rIN/cm_strings.xml b/core/res/res/values-ml-rIN/cm_strings.xml
index cfeaf7fb062..3262d4c7b11 100644
--- a/core/res/res/values-ml-rIN/cm_strings.xml
+++ b/core/res/res/values-ml-rIN/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">റൂട്ട് പ്രവേശനം നേടുക</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">ഈ സ്ക്രീൻ വേര്‍തിരിക്കുക ചെയ്യുന്നതിന്, പിന്നിലേക്ക് ബട്ടൺ അമര്‍ത്തിപ്പിടിക്കുക.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">യാന്ത്രികമായി</string>
-  <string name="live_display_auto_summary">സൂര്യാസ്തമയത്തിനും സൂര്യോദയത്തിനും ശേഷം സ്ക്രീനിന്റെ കളര്‍ താപനില സ്വയം ക്രമീകരിക്കുക</string>
-  <string name="live_display_off">ഓഫാണ്</string>
-  <string name="live_display_off_summary">എല്ലാ ക്രമീകരണങ്ങളും അപ്രാപ്തമാക്കുക</string>
-  <string name="live_display_day">ദിവസം</string>
-  <string name="live_display_day_summary">പകല്‍ ക്രമീകരണങ്ങൾ മാത്രം ഉപയോഗിക്കുക</string>
-  <string name="live_display_night">രാത്രി</string>
-  <string name="live_display_night_summary">രാത്രി ക്രമീകരണങ്ങൾ മാത്രം ഉപയോഗിക്കുക</string>
-  <string name="live_display_outdoor">ഔട്ട്ഡോർ (തെളിഞ്ഞ സൂര്യൻ)</string>
-  <string name="live_display_outdoor_summary">ഔട്ട്ഡോർ ക്രമീകരണങ്ങൾ മാത്രം ഉപയോഗിക്കുക</string>
-  <string name="live_display_hint">ലൈവ്ഡിസ്പ്ലേ നിങ്ങളുടെ കണ്ണിന്റെ സമ്മര്‍ദ്ദം കുറയ്ക്കുകയും രാത്രി ഉറങ്ങാൻ നിങ്ങളെ സഹായിക്കുകയും ചെയ്യുന്നു. ഇത് പരീക്ഷിക്കാൻ ഇവിടെ ക്ലിക്ക് ചെയ്യുക!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">ബന്ധിപ്പിച്ച ഉപകരണം ഇല്ല</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ബന്ധിപ്പിച്ച ഉപകരണം</string>
diff --git a/core/res/res/values-mn-rMN/cm_strings.xml b/core/res/res/values-mn-rMN/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-mn-rMN/cm_strings.xml
+++ b/core/res/res/values-mn-rMN/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-mr-rIN/cm_strings.xml b/core/res/res/values-mr-rIN/cm_strings.xml
index 608761ef228..86845d9e445 100644
--- a/core/res/res/values-mr-rIN/cm_strings.xml
+++ b/core/res/res/values-mr-rIN/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">रूट ऍक्सेस मिळवा</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">हा स्क्रीन अनपिन करण्यासाठी, मागे बटण दाबून धरा.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">स्वयंचलित</string>
-  <string name="live_display_auto_summary">सूर्यास्त व सूर्योदयानंतर स्क्रीनचे रंग तापमान स्वयंचलितपणे समायोजित करा</string>
-  <string name="live_display_off">बंद</string>
-  <string name="live_display_off_summary">सर्व समायोजने अक्षम करा</string>
-  <string name="live_display_day">दिवस</string>
-  <string name="live_display_day_summary">केवळ दिवस सेटिंग्ज वापरा</string>
-  <string name="live_display_night">रात्र</string>
-  <string name="live_display_night_summary">केवळ रात्र सेटिंग्ज वापरा</string>
-  <string name="live_display_outdoor">आऊटडोअर (चमकदार सूर्य)</string>
-  <string name="live_display_outdoor_summary">केवळ आऊटडोअर सेटिंग्ज वापरा</string>
-  <string name="live_display_hint">थेटप्रदर्शन डोळ्यांचा ताण कमी करण्यास मदत करते आणि तुम्हाला रात्री झोपण्यास मदत करते. ते वापरून पाहण्यासाठी इथे क्लिक करा!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">कनेक्टेड डिव्हाइस नाही</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> कनेक्टेड डिव्हाइस</string>
diff --git a/core/res/res/values-ms-rMY/cm_strings.xml b/core/res/res/values-ms-rMY/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-ms-rMY/cm_strings.xml
+++ b/core/res/res/values-ms-rMY/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-my-rMM/cm_strings.xml b/core/res/res/values-my-rMM/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-my-rMM/cm_strings.xml
+++ b/core/res/res/values-my-rMM/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-nb/cm_strings.xml b/core/res/res/values-nb/cm_strings.xml
index 692e45e5b83..169dd09aadb 100644
--- a/core/res/res/values-nb/cm_strings.xml
+++ b/core/res/res/values-nb/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">få root-tilgang</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">For å unpin denne skjermen, trykk og hold tilbake-knappen.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automatisk</string>
-  <string name="live_display_auto_summary">Juster fargetemperatur på skjermen etter solnedgang og soloppgang</string>
-  <string name="live_display_off">Av</string>
-  <string name="live_display_off_summary">Deaktivere alle justeringer</string>
-  <string name="live_display_day">Dag</string>
-  <string name="live_display_day_summary">Bruk kun dag innstillinger</string>
-  <string name="live_display_night">Natt</string>
-  <string name="live_display_night_summary">Bruk kun natt instillinger</string>
-  <string name="live_display_outdoor">Utendørs (sterkt sollys)</string>
-  <string name="live_display_outdoor_summary">Bruk kun utendørs innstillinger</string>
-  <string name="live_display_hint">LiveDisplay kan hjelpe deg med å redusere belastningen på øynene og hjelpe deg med å sove om natten. Trykk her for å prøve det ut!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Ingen tilkoblede enheter</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> tilkoblet enhet</string>
diff --git a/core/res/res/values-ne-rNP/cm_strings.xml b/core/res/res/values-ne-rNP/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-ne-rNP/cm_strings.xml
+++ b/core/res/res/values-ne-rNP/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-nl/cm_strings.xml b/core/res/res/values-nl/cm_strings.xml
index 52504460458..9ef687114b3 100644
--- a/core/res/res/values-nl/cm_strings.xml
+++ b/core/res/res/values-nl/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">root-toegang krijgen</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Blijf de Terug-knop aanraken om dit scherm los te maken.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automatisch</string>
-  <string name="live_display_auto_summary">Automatisch kleurtemperatuur van scherm aanpassen na zonsopkomst en -ondergang</string>
-  <string name="live_display_off">Uit</string>
-  <string name="live_display_off_summary">Alle aanpassingen uitschakelen</string>
-  <string name="live_display_day">Overdag</string>
-  <string name="live_display_day_summary">Alleen instellingen voor overdag gebruiken</string>
-  <string name="live_display_night">\'s Nachts</string>
-  <string name="live_display_night_summary">Alleen instellingen voor \'s nachts gebruiken</string>
-  <string name="live_display_outdoor">Buitenshuis (felle zon)</string>
-  <string name="live_display_outdoor_summary">Alleen instellingen voor buitenshuis gebruiken</string>
-  <string name="live_display_hint">LiveDisplay kan oogvermoeidheid verminderen en helpt u om \'s nachts te slapen. Tik hier om het uit te proberen</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Geen aangesloten apparaat</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> aangesloten apparaat</string>
diff --git a/core/res/res/values-oc-rFR/cm_strings.xml b/core/res/res/values-oc-rFR/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-oc-rFR/cm_strings.xml
+++ b/core/res/res/values-oc-rFR/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-or-rIN/cm_strings.xml b/core/res/res/values-or-rIN/cm_strings.xml
index af6a5d09b19..a591a6297b5 100644
--- a/core/res/res/values-or-rIN/cm_strings.xml
+++ b/core/res/res/values-or-rIN/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">ରୁଟ୍‍ ପ୍ରବେଶ ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">ଏହି ସ୍କ୍ରିନ୍‍ ଅନ୍‍ପିନ୍‍ କରିବା ପାଇଁ, ବ୍ୟାକ୍‍ ବଟନ୍‍ ସ୍ପର୍ଶ କରନ୍ତୁ ଓ ଧରିରଖନ୍ତୁ।</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">ସ୍ୱତଃସ୍ପୃତ</string>
-  <string name="live_display_auto_summary">ସୂର୍ଯ୍ୟାସ୍ତ ଓ ସୂର୍ଯ୍ୟୋଦୟ ପରେ ରଙ୍ଗ ତାପମାତ୍ରା ସ୍ୱତଃ ଆଡ୍‍ଜଷ୍ଟ କରନ୍ତୁ</string>
-  <string name="live_display_off">ଅଫ୍</string>
-  <string name="live_display_off_summary">ସ୍ସମସ୍ତ ଆଡ୍‍ଜଷ୍ଟ୍ମେଣ୍ଟ ଅଷମ କରନ୍ତୁ</string>
-  <string name="live_display_day">ଦିନ</string>
-  <string name="live_display_day_summary">କେବଳ ଦିନ ସେଟିଂସ୍‍ ବ୍ୟବହାର କରନ୍ତୁ</string>
-  <string name="live_display_night">ରାତ୍ରି</string>
-  <string name="live_display_night_summary">କେବଳ ରାତ୍ରି ସେଟିଂସ୍‍ ବ୍ୟବହାର କରନ୍ତୁ</string>
-  <string name="live_display_outdoor">ଆଉଟ୍‍ଡୋର୍‍ (ଟାଣ ଖରା)</string>
-  <string name="live_display_outdoor_summary">କେବଳ ଆଉଟ୍‍ଡୋର୍‍ ସେଟିଂସ୍‍ ବ୍ୟବହାର କରନ୍ତୁ</string>
-  <string name="live_display_hint">ଲାଇଭ୍‍ଡିସ୍‍ପ୍ଲେ ଆଇଷ୍ଟ୍ରେନ୍‍ କମାଇବାରେ ଓ ରାତିରେ ଆପଣଙ୍କୁ ଶୋଇବାରେ ସାହାଯ୍ୟ କରିପାରେ। ଏହା ବ୍ୟବହାର କରିବା ପାଇଁ ଏଠାରେ କ୍ଲିକ୍‍ କରନ୍ତୁ!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">ସଂଯୋଗ ହୋଇଥିବା କିଛି ଡିଭାଇସ୍‍ ନା୍ହିଁ</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ସଂଯୋଗ ହୋଇଥିବା ଡିଭାଇସ୍</string>
diff --git a/core/res/res/values-pa-rIN/cm_strings.xml b/core/res/res/values-pa-rIN/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-pa-rIN/cm_strings.xml
+++ b/core/res/res/values-pa-rIN/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-pl/cm_strings.xml b/core/res/res/values-pl/cm_strings.xml
index b19e3cfe696..c0edab422f0 100644
--- a/core/res/res/values-pl/cm_strings.xml
+++ b/core/res/res/values-pl/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">dostęp do roota</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Aby odpiąć ekran, dotknij i przytrzymaj przycisk Wstecz.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automatycznie</string>
-  <string name="live_display_auto_summary">Automatycznie dostosuj temperaturę kolorów ekranu po zachodzie i wschodzie słońca</string>
-  <string name="live_display_off">Wyłączony</string>
-  <string name="live_display_off_summary">Wyłącz wszystkie zmiany</string>
-  <string name="live_display_day">Dzień</string>
-  <string name="live_display_day_summary">Używaj tylko ustawień na dzień</string>
-  <string name="live_display_night">Noc</string>
-  <string name="live_display_night_summary">Używaj ustawień tylko w nocy</string>
-  <string name="live_display_outdoor">Na zewnątrz (jasne światło)</string>
-  <string name="live_display_outdoor_summary">Używaj ustawienia tylko na zewnątrz</string>
-  <string name="live_display_hint">LiveDisplay może pomóc w zredukowaniu efektu zmęczenia oczu oraz pomaga zasnąć w nocy. Kliknij tutaj, aby wypróbować!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Brak podłączonego urządzenia</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s </xliff:g> podłączone urządzenie</string>
diff --git a/core/res/res/values-pt-rBR/cm_strings.xml b/core/res/res/values-pt-rBR/cm_strings.xml
index 0541ea89760..22be9bd8f2c 100644
--- a/core/res/res/values-pt-rBR/cm_strings.xml
+++ b/core/res/res/values-pt-rBR/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">obter acesso super usuário</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Para desafixar esta tela, toque e segure o botão Voltar.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automático</string>
-  <string name="live_display_auto_summary">Ajusta automaticamente a temperatura de cor da tela após o pôr do sol e nascer do sol</string>
-  <string name="live_display_off">Desligado</string>
-  <string name="live_display_off_summary">Desativar todos os ajustes</string>
-  <string name="live_display_day">Dia</string>
-  <string name="live_display_day_summary">Usar apenas configurações diurnas</string>
-  <string name="live_display_night">Noite</string>
-  <string name="live_display_night_summary">Use apenas configurações noturnas</string>
-  <string name="live_display_outdoor">Ao ar livre (sol forte)</string>
-  <string name="live_display_outdoor_summary">Usar apenas configurações ao ar livre</string>
-  <string name="live_display_hint">LiveDisplay pode ajudar a reduzir o cansaço visual e ajudá-lo a dormir à noite. Clique aqui para experimentar!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nenhum dispositivo conectado</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> dispositivo conectado</string>
diff --git a/core/res/res/values-pt-rPT/cm_strings.xml b/core/res/res/values-pt-rPT/cm_strings.xml
index df0f4c3e384..bc1fd5f1f67 100644
--- a/core/res/res/values-pt-rPT/cm_strings.xml
+++ b/core/res/res/values-pt-rPT/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">obter acesso root</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Para soltar este ecrã, toque e segure o botão Voltar.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automático</string>
-  <string name="live_display_auto_summary">Ajusta automaticamente a temperatura de cor do ecrã após o pôr do sol e o nascer do sol</string>
-  <string name="live_display_off">Desligado</string>
-  <string name="live_display_off_summary">Desativar todos os ajustes</string>
-  <string name="live_display_day">Dia</string>
-  <string name="live_display_day_summary">Usar apenas as definições de dia</string>
-  <string name="live_display_night">Noite</string>
-  <string name="live_display_night_summary">Usar apenas as definições de noite</string>
-  <string name="live_display_outdoor">Exterior (sol brilhante)</string>
-  <string name="live_display_outdoor_summary">Usar apenas as definições de exterior</string>
-  <string name="live_display_hint">LiveDisplay pode ajudar a reduzir a fadiga ocular e ajudar-te a dormir à noite. Clique aqui para experimentar!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nenhum dispositivo conectado</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> dispositivo conectado</string>
diff --git a/core/res/res/values-rm/cm_strings.xml b/core/res/res/values-rm/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-rm/cm_strings.xml
+++ b/core/res/res/values-rm/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-ro/cm_strings.xml b/core/res/res/values-ro/cm_strings.xml
index dc878812f24..1587713f579 100644
--- a/core/res/res/values-ro/cm_strings.xml
+++ b/core/res/res/values-ro/cm_strings.xml
@@ -167,18 +167,6 @@
   <string name="app_ops_su">obțină acces root</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Pentru a anula fixarea acestui ecran, atingeți și țineți apăsat butonul Înapoi.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automat</string>
-  <string name="live_display_auto_summary">Reglează automat temperatura de culoare de pe ecran după apus și răsărit</string>
-  <string name="live_display_off">Oprit</string>
-  <string name="live_display_off_summary">Dezactivează toate ajustările</string>
-  <string name="live_display_day">Zi</string>
-  <string name="live_display_day_summary">Utilizați numai setările de zi</string>
-  <string name="live_display_night">Noapte</string>
-  <string name="live_display_night_summary">Utilizați numai setările de noapte</string>
-  <string name="live_display_outdoor">În aer liber (soare strălucitor)</string>
-  <string name="live_display_outdoor_summary">Utilizați numai setările în aer liber</string>
-  <string name="live_display_hint">LiveDisplay poate reduce oboseala ochilor și vă poate ajuta să dormiți noaptea. Apăsați aici pentru a-l încerca!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Niciun dispozitiv conectat</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s </xliff:g> dispozitiv conectat</string>
diff --git a/core/res/res/values-ru/cm_strings.xml b/core/res/res/values-ru/cm_strings.xml
index 6703a25e6e8..38f6a599239 100644
--- a/core/res/res/values-ru/cm_strings.xml
+++ b/core/res/res/values-ru/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">получить права суперпользователя</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Чтобы открепить экран, нажмите и удерживайте кнопку «Назад».</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Автоматически</string>
-  <string name="live_display_auto_summary">Автоматическая подстройка цветовой температуры экрана после заката и восхода солнца</string>
-  <string name="live_display_off">Отключить</string>
-  <string name="live_display_off_summary">Отключить автоподстройку</string>
-  <string name="live_display_day">День</string>
-  <string name="live_display_day_summary">Только дневные настройки</string>
-  <string name="live_display_night">Ночь</string>
-  <string name="live_display_night_summary">Только ночные настройки</string>
-  <string name="live_display_outdoor">На улице (яркое солнце)</string>
-  <string name="live_display_outdoor_summary">Только уличный режим</string>
-  <string name="live_display_hint">LiveDisplay поможет снизить зрительное напряжение и улучшить сон. Нажмите здесь, чтобы попробовать!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Нет подключенных устройств</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> подключенное устройство</string>
diff --git a/core/res/res/values-si-rLK/cm_strings.xml b/core/res/res/values-si-rLK/cm_strings.xml
index 7b5c9d0755b..0ceea5e7a99 100644
--- a/core/res/res/values-si-rLK/cm_strings.xml
+++ b/core/res/res/values-si-rLK/cm_strings.xml
@@ -123,7 +123,6 @@
   <string name="app_ops_write_mms">MMS පණිවිඩයක් ලිවීම</string>
   <string name="app_ops_write_sms">කෙටි පණිවිඩයක් ලිවීම</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-sk/cm_strings.xml b/core/res/res/values-sk/cm_strings.xml
index 3e3c8667834..31eb96b930c 100644
--- a/core/res/res/values-sk/cm_strings.xml
+++ b/core/res/res/values-sk/cm_strings.xml
@@ -151,18 +151,6 @@
   <string name="app_ops_su">získať root prístup</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Na odopnutie tejto obrazovky stlačte a podržte tlačidlo Späť.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automatické</string>
-  <string name="live_display_auto_summary">Automaticky upraviť teplotu farieb obrazovky po západe a východe slnka</string>
-  <string name="live_display_off">Vypnuté</string>
-  <string name="live_display_off_summary">Zakázať všetky úpravy</string>
-  <string name="live_display_day">Deň</string>
-  <string name="live_display_day_summary">Použiť len nastavenia pre deň</string>
-  <string name="live_display_night">Noc</string>
-  <string name="live_display_night_summary">Použiť len nastavenia pre noc</string>
-  <string name="live_display_outdoor">Vonku (jasné slnko)</string>
-  <string name="live_display_outdoor_summary">Používať len nastavenia pre vonkajšie prostredie</string>
-  <string name="live_display_hint">LiveDisplay môže pomôcť znížiť únavu očí a pomôže vám spať v noci. Kliknite sem a vyskúšajte túto funkciu!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Žiadne pripojené zariadenie</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> pripojené zariadenie</string>
diff --git a/core/res/res/values-sl/cm_strings.xml b/core/res/res/values-sl/cm_strings.xml
index c4df2782e91..06484868856 100644
--- a/core/res/res/values-sl/cm_strings.xml
+++ b/core/res/res/values-sl/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">pridobitev skrbniškega dostopa</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Da odpnete ta zaslon, se dotaknite in pridržite gumb Nazaj.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Samodejno</string>
-  <string name="live_display_auto_summary">Samodejno nastavi barvno temperaturo zaslona po sončnem zahodu in vzhodu</string>
-  <string name="live_display_off">Izklopljen</string>
-  <string name="live_display_off_summary">Onemogoči vse prilagoditve</string>
-  <string name="live_display_day">Dan</string>
-  <string name="live_display_day_summary">Uporabi samo dnevne nastavitve</string>
-  <string name="live_display_night">Noč</string>
-  <string name="live_display_night_summary">Uporabi samo nočne nastavitve</string>
-  <string name="live_display_outdoor">Na prostem (močna svetloba)</string>
-  <string name="live_display_outdoor_summary">Uporabi samo nastavitve na prostem</string>
-  <string name="live_display_hint">LiveDisplay vam lahko pomaga pri zmanjšanju obremenitve oči in spanju ponoči. Kliknite tukaj, da ga preskusite!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nobene naprave ni povezane</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> povezana naprava</string>
diff --git a/core/res/res/values-sq-rAL/cm_strings.xml b/core/res/res/values-sq-rAL/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-sq-rAL/cm_strings.xml
+++ b/core/res/res/values-sq-rAL/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-sr/cm_strings.xml b/core/res/res/values-sr/cm_strings.xml
index e33bdafc270..b15b557dba4 100644
--- a/core/res/res/values-sr/cm_strings.xml
+++ b/core/res/res/values-sr/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">дај root приступ</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Да искључиш овај екран додирни и држи дугме за назад.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Аутоматски</string>
-  <string name="live_display_auto_summary">Аутоматски прилагоди температуру боје екрана после сумрака и свитања</string>
-  <string name="live_display_off">Искључено</string>
-  <string name="live_display_off_summary">Онемогућити сва подешавања</string>
-  <string name="live_display_day">Дан</string>
-  <string name="live_display_day_summary">Користи само дневна подешавања</string>
-  <string name="live_display_night">Ноћ</string>
-  <string name="live_display_night_summary">Користи само ноћна подешавања</string>
-  <string name="live_display_outdoor">Напољу (јако сунце)</string>
-  <string name="live_display_outdoor_summary">Користи само подешавања за напоље</string>
-  <string name="live_display_hint">LiveDisplay може смањити напрезање очију и помоћи да спавате ноћу. Додирните да пробате!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Нема повезаног уређаја</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> конектован уређај</string>
diff --git a/core/res/res/values-sv/cm_strings.xml b/core/res/res/values-sv/cm_strings.xml
index 4bfe6653c89..c5c91b05350 100644
--- a/core/res/res/values-sv/cm_strings.xml
+++ b/core/res/res/values-sv/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">få root-åtkomst</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">För att frigöra denna skärm, tryck och håll nere Bakåt-knappen.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Automatisk</string>
-  <string name="live_display_auto_summary">Justera automatiskt skärmens färgtemperatur efter solnedgång och soluppgång</string>
-  <string name="live_display_off">Av</string>
-  <string name="live_display_off_summary">Inaktivera alla justeringar</string>
-  <string name="live_display_day">Dag</string>
-  <string name="live_display_day_summary">Använd enbart dagläge</string>
-  <string name="live_display_night">Natt</string>
-  <string name="live_display_night_summary">Använd enbart nattläge</string>
-  <string name="live_display_outdoor">Utomhus (stark sol)</string>
-  <string name="live_display_outdoor_summary">Använd endast utomhusläge</string>
-  <string name="live_display_hint">LiveDisplay kan minska överansträngning av ögon och hjälpa dig med nattsömnen. Klicka här för att prova!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Ingen ansluten enhet</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ansluten enhet</string>
diff --git a/core/res/res/values-sw/cm_strings.xml b/core/res/res/values-sw/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-sw/cm_strings.xml
+++ b/core/res/res/values-sw/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-ta-rIN/cm_strings.xml b/core/res/res/values-ta-rIN/cm_strings.xml
index c570a518848..9b129f35731 100644
--- a/core/res/res/values-ta-rIN/cm_strings.xml
+++ b/core/res/res/values-ta-rIN/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">மூல அணுகலைப் பெறு</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">இந்த திரையை அன்பின் செய்ய, பின்செல் பொத்தானைத் தொட்டு பிடித்துக்கொள்.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">தானியங்கு</string>
-  <string name="live_display_auto_summary">சூரிய மறைவு மற்றும் சூரிய உதயத்திற்கு பிறகு தானாகவே திரையின் வண்ன தட்பவெப்பங்களை சரிசெய்</string>
-  <string name="live_display_off">முடக்கத்தில்</string>
-  <string name="live_display_off_summary">அனைத்து சரிசெய்தல்களையும் முடக்கு</string>
-  <string name="live_display_day">பகல்</string>
-  <string name="live_display_day_summary">பகல் அமைப்புகளை மட்டும் பயன்படுத்துக</string>
-  <string name="live_display_night">இரவு</string>
-  <string name="live_display_night_summary">இரவு அமைப்புகளை மட்டும் பயன்படுத்து</string>
-  <string name="live_display_outdoor">வெளியிடம் (பிரகாசமான சூரியன்)</string>
-  <string name="live_display_outdoor_summary">வெளிப்புற அமைப்புகளை மட்டுமே பயன்படுத்து.</string>
-  <string name="live_display_hint">LiveDisplay கண்ணழுத்தத்தை குறைத்து, நீங்கள் இரவிலே உறங்க உதவுகிறது. அதை முயற்சிக்க இங்கே கிளிக் செய்க!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">இணைக்கப்பட்ட சாதனம் இல்லை</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> இணைக்கப்பட்ட சாதனம்</string>
diff --git a/core/res/res/values-te-rIN/cm_strings.xml b/core/res/res/values-te-rIN/cm_strings.xml
index 1ffcfa27ae9..6200a30b806 100644
--- a/core/res/res/values-te-rIN/cm_strings.xml
+++ b/core/res/res/values-te-rIN/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">మూలాంశ ప్రాప్యతను పొందుము</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">ఈ స్క్రీనును అన్పిన్ చేయడానికి, బ్యాక్ బటనును తాకండి మరియు పట్టుకోండి.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">స్వయంచాలకం</string>
-  <string name="live_display_auto_summary">సూర్యాస్తమయం మరియు సూర్యోదయం తరువాత స్వయంచాలకంగా స్క్రీన్ యొక్క వర్ణ ఉష్ణోగ్రతను సవరించుము.</string>
-  <string name="live_display_off">ఆఫ్‌ </string>
-  <string name="live_display_off_summary">అన్ని సవరణలను నిలిపివేయుము</string>
-  <string name="live_display_day">పగలు</string>
-  <string name="live_display_day_summary">పగటి సెట్టింగులను మాత్రమే ఉపయోగించుము</string>
-  <string name="live_display_night">రాత్రి</string>
-  <string name="live_display_night_summary">రాత్రి సెట్టింగులను మాత్రమే ఉపయోగించుము</string>
-  <string name="live_display_outdoor">ఆరుబయట (ప్రకాశవంతమైన సూర్యుడు)</string>
-  <string name="live_display_outdoor_summary">ఆరుబయటి సెట్టింగులను మాత్రమే ఉపయోగించుము</string>
-  <string name="live_display_hint">ప్రత్యక్ష ప్రదర్శన మీ కంటిపై ఒత్తిడిని తగ్గించడానికి సహాయపడుతుంది మరియు రాత్రి సమయంలో నిద్రపోవడానికి సహకరిస్తుంది. దానిని ప్రయత్నించి చూడడానికి ఇక్కడ క్లిక్ చేయండి!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">ఎటువంటి పరికరం అనుసంధానించబడలేదు</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> అనుసంధానించబడిన పరికరం</string>
diff --git a/core/res/res/values-th/cm_strings.xml b/core/res/res/values-th/cm_strings.xml
index 9f6f5fc6d13..cd6f80ec8d0 100644
--- a/core/res/res/values-th/cm_strings.xml
+++ b/core/res/res/values-th/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">รับสิทธิผู้ดูแลระบบ</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">เพื่อยกเลิกการปักหมุดหน้าจอนี้ กดปุ่มกลับค้างไว้</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">อัตโนมัติ</string>
-  <string name="live_display_auto_summary">ตั้งอุณหภูมิสีจออัตโนมัติหลังดวงอาทิตย์ขึ้นและตก</string>
-  <string name="live_display_off">ปิด</string>
-  <string name="live_display_off_summary">ปิดการปรับแต่งทั้งหมด</string>
-  <string name="live_display_day">กลางวัน</string>
-  <string name="live_display_day_summary">ใช้การตั้งค่ากลางวันเท่านั้น</string>
-  <string name="live_display_night">กลางคืน</string>
-  <string name="live_display_night_summary">ใช้การตั้งค่ากลางคืนเท่านั้น</string>
-  <string name="live_display_outdoor">กลางแจ้ง (แดดจ้า)</string>
-  <string name="live_display_outdoor_summary">ใช้การตั้งค่ากลางแจ้งเท่านั้น</string>
-  <string name="live_display_hint">LiveDisplay สามารถช่วยลดอาการปวดตา และช่วยให้คุณนอนหลับในเวลากลางคืน คลิกที่นี่เพื่อลองใช้!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">ไม่มีอุปกรณ์เชื่อมต่อ</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> อุปกรณ์เชื่อมต่ออยู่</string>
diff --git a/core/res/res/values-tr/cm_strings.xml b/core/res/res/values-tr/cm_strings.xml
index a1ff20bd3e2..7e315851dda 100644
--- a/core/res/res/values-tr/cm_strings.xml
+++ b/core/res/res/values-tr/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">root erişimi al</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Bu ekranı kaldırmak için Geri tuşuna dokunun ve tutun.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Otomatik</string>
-  <string name="live_display_auto_summary">Gün batımı ve doğumundan sonra ekranın renk sıcaklığını otomatik ayarlar</string>
-  <string name="live_display_off">Kapalı</string>
-  <string name="live_display_off_summary">Tüm ayarlamaları devre dışı bırak</string>
-  <string name="live_display_day">Gündüz</string>
-  <string name="live_display_day_summary">Sadece gündüz ayarlarını kullan</string>
-  <string name="live_display_night">Gece</string>
-  <string name="live_display_night_summary">Sadece gece ayarlarını kullan</string>
-  <string name="live_display_outdoor">Açık alan (parlak güneş)</string>
-  <string name="live_display_outdoor_summary">Sadece açık alan ayarlarını kullan</string>
-  <string name="live_display_hint">LiveDisplay göz yorgunluğunuzu azaltıp geceleri uyumanıza yardımcı olabilir. Denemek için buraya tıklayın!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Bağlı cihaz yok</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s </xliff:g> cihaz bağlı</string>
diff --git a/core/res/res/values-ug/cm_strings.xml b/core/res/res/values-ug/cm_strings.xml
index 795dba9165d..c40799cfbfc 100644
--- a/core/res/res/values-ug/cm_strings.xml
+++ b/core/res/res/values-ug/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">root ھوقۇقىغا ئېرىشىدۇ</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">بۇ مۇقىم ئېكراننى يوق قىلىش ئۈچۈن، قايتىش كۇنۇپكىسىنى بېسىپ تۇرۇڭ.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">ئاپتوماتىك</string>
-  <string name="live_display_auto_summary">كۈن چىققان ۋە كۈن پاتقاندىن كېيىن ئېكران رەڭ تېمپېراتورىسىنى ئۆزلۈكىدىن تەڭشەيدۇ</string>
-  <string name="live_display_off">تاقاق</string>
-  <string name="live_display_off_summary">بارلىق تەڭشەشلەرنى چەكلەيدۇ</string>
-  <string name="live_display_day">كۈندۈز</string>
-  <string name="live_display_day_summary">كۈندۈز تەڭشەكلىرىنىلا ئىشلىتىدۇ</string>
-  <string name="live_display_night">كېچە</string>
-  <string name="live_display_night_summary">كېچە تەڭشەكلىرىنىلا ئىشلىتىدۇ</string>
-  <string name="live_display_outdoor">تالا (قۇياش نۇرى)</string>
-  <string name="live_display_outdoor_summary">تالا تەڭشەكلىرىنىلا ئىشلىتىدۇ</string>
-  <string name="live_display_hint">LiveDisplay كۆزنىڭ چارچىشىنى يېنىكلىتىشكە ياردەم بېرىدۇ، كېچىدە ئۇخلىشىڭىزغا ياردەم بېرىدۇ. سىناش ئۈچۈن بۇ جاينى چېكىڭ!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">ئۇلانغان ئۈسكۈنە يوق</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ئۈسكۈنە ئۇلاندى</string>
diff --git a/core/res/res/values-uk/cm_strings.xml b/core/res/res/values-uk/cm_strings.xml
index 15fb7241fab..03b49d78521 100644
--- a/core/res/res/values-uk/cm_strings.xml
+++ b/core/res/res/values-uk/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">отримати root-доступ</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Щоб відкріпити цей екран, торкніться й утримуйте кнопку назад.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Автоматично</string>
-  <string name="live_display_auto_summary">Автоматичне підлаштування температури кольору екрана після сходу та заходу сонця</string>
-  <string name="live_display_off">Вимк</string>
-  <string name="live_display_off_summary">Вимкнути авторегулювання</string>
-  <string name="live_display_day">День</string>
-  <string name="live_display_day_summary">Використовувати параметри для денного освітлення</string>
-  <string name="live_display_night">Ніч</string>
-  <string name="live_display_night_summary">Використовувати параметри для нічного освітлення</string>
-  <string name="live_display_outdoor">Надворі (яскраве сонце)</string>
-  <string name="live_display_outdoor_summary">Використовувати параметри для яскравого освітлення надворі</string>
-  <string name="live_display_hint">LiveDisplay допоможе зменшити навантаження на зір та покращить Ваш сон. Натисніть тут, щоб спробувати його!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Немає під\'єднаного пристрою</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> підключений пристрій</string>
diff --git a/core/res/res/values-ur-rPK/cm_strings.xml b/core/res/res/values-ur-rPK/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-ur-rPK/cm_strings.xml
+++ b/core/res/res/values-ur-rPK/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-uz-rUZ/cm_strings.xml b/core/res/res/values-uz-rUZ/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-uz-rUZ/cm_strings.xml
+++ b/core/res/res/values-uz-rUZ/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values-vi/cm_strings.xml b/core/res/res/values-vi/cm_strings.xml
index 7ea2ee668e9..035cb156914 100644
--- a/core/res/res/values-vi/cm_strings.xml
+++ b/core/res/res/values-vi/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">lấy quyền truy cập root</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Để bỏ ghim màn hình này, hãy chạm và giữ phím Quay lại.</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">Tự động</string>
-  <string name="live_display_auto_summary">Tự động chỉnh nhiệt độ màu của màn hình theo ngày và đêm</string>
-  <string name="live_display_off">Tắt</string>
-  <string name="live_display_off_summary">Vô hiệu hoá tất cả điều chỉnh</string>
-  <string name="live_display_day">Ngày</string>
-  <string name="live_display_day_summary">Chỉ sử dụng cài đặt ban ngày</string>
-  <string name="live_display_night">Đêm</string>
-  <string name="live_display_night_summary">Chỉ sử dụng cài đặt ban đêm</string>
-  <string name="live_display_outdoor">Ngoài trời (ánh sáng mặt trời)</string>
-  <string name="live_display_outdoor_summary">Chỉ sử dụng cài đặt ngoài trời</string>
-  <string name="live_display_hint">LiveDisplay có thể giúp giảm mỏi mắt và giúp bạn ngủ vào ban đêm. Nhấn vào đây để thử!</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Không có thiết bị kết nối</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> thiết bị đã kết nối</string>
diff --git a/core/res/res/values-zh-rCN/cm_strings.xml b/core/res/res/values-zh-rCN/cm_strings.xml
index 67b1256684e..6f522d17b4f 100644
--- a/core/res/res/values-zh-rCN/cm_strings.xml
+++ b/core/res/res/values-zh-rCN/cm_strings.xml
@@ -168,18 +168,6 @@
   <string name="app_ops_su">获取 Root 权限</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">要取消固定此屏幕，触摸并按住返回键。</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">自动</string>
-  <string name="live_display_auto_summary">在日出和日落后自动调节屏幕色温</string>
-  <string name="live_display_off">关闭</string>
-  <string name="live_display_off_summary">禁用所有调整</string>
-  <string name="live_display_day">白天</string>
-  <string name="live_display_day_summary">仅使用白天设置</string>
-  <string name="live_display_night">夜晚</string>
-  <string name="live_display_night_summary">仅使用夜晚设置</string>
-  <string name="live_display_outdoor">户外（阳光）</string>
-  <string name="live_display_outdoor_summary">仅使用户外设置</string>
-  <string name="live_display_hint">LiveDisplay 可以帮助减少眼睛疲劳，帮助您的夜间睡眠。点击此处来试一试！</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">没有已连接设备</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> 个已连接的设备</string>
diff --git a/core/res/res/values-zh-rHK/cm_strings.xml b/core/res/res/values-zh-rHK/cm_strings.xml
index 6d57333bd7c..7a738ea192d 100644
--- a/core/res/res/values-zh-rHK/cm_strings.xml
+++ b/core/res/res/values-zh-rHK/cm_strings.xml
@@ -132,18 +132,6 @@
   <string name="app_ops_write_sms">編寫短訊</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">要解鎖此螢幕，觸碰並按住返回鍵。</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">自動</string>
-  <string name="live_display_auto_summary">在白天和夜晚自動調節螢幕顏色溫度</string>
-  <string name="live_display_off">關閉</string>
-  <string name="live_display_off_summary">停用所有調整</string>
-  <string name="live_display_day">白天</string>
-  <string name="live_display_day_summary">僅使用白天設定</string>
-  <string name="live_display_night">夜間</string>
-  <string name="live_display_night_summary">僅使用夜間設定</string>
-  <string name="live_display_outdoor">戶外（陽光）</string>
-  <string name="live_display_outdoor_summary">僅使用戶外設定</string>
-  <string name="live_display_hint">LiveDisplay 可有助減少眼睛疲勞，有助晚上睡眠。按下此處試試！</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">沒有已連接的裝置</string>
   <!-- Keyguard strings -->
diff --git a/core/res/res/values-zh-rTW/cm_strings.xml b/core/res/res/values-zh-rTW/cm_strings.xml
index f3d7547281a..6edafdb5787 100644
--- a/core/res/res/values-zh-rTW/cm_strings.xml
+++ b/core/res/res/values-zh-rTW/cm_strings.xml
@@ -165,18 +165,6 @@
   <string name="app_ops_su">取得 Root 權限</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">要解鎖此螢幕，觸摸並按住返回鍵。</string>
-  <!-- LiveDisplay strings -->
-  <string name="live_display_auto">自動</string>
-  <string name="live_display_auto_summary">在白天和夜晚自動調節螢幕顏色溫度</string>
-  <string name="live_display_off">關閉</string>
-  <string name="live_display_off_summary">禁用所有的調整</string>
-  <string name="live_display_day">白天</string>
-  <string name="live_display_day_summary">僅使用白天設定</string>
-  <string name="live_display_night">夜間</string>
-  <string name="live_display_night_summary">僅使用夜間設定</string>
-  <string name="live_display_outdoor">戶外 (陽光)</string>
-  <string name="live_display_outdoor_summary">僅使用戶外設定</string>
-  <string name="live_display_hint">LiveDisplay 可以幫助減少眼睛的疲勞及睡前使用造成的不適。輕觸此處來試試！</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">沒有已連接的裝置</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> 個已連接裝置</string>
diff --git a/core/res/res/values-zu/cm_strings.xml b/core/res/res/values-zu/cm_strings.xml
index 6dfdc6bd3e9..2ce9b8bbacc 100644
--- a/core/res/res/values-zu/cm_strings.xml
+++ b/core/res/res/values-zu/cm_strings.xml
@@ -56,7 +56,6 @@
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <!-- App ops requests -->
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <!-- LiveDisplay strings -->
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <!-- Keyguard strings -->
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
diff --git a/core/res/res/values/cm_arrays.xml b/core/res/res/values/cm_arrays.xml
index 6629b4f97c9..f66cb0626f7 100644
--- a/core/res/res/values/cm_arrays.xml
+++ b/core/res/res/values/cm_arrays.xml
@@ -188,31 +188,6 @@
         <item>@string/app_ops_su</item>
     </string-array>
 
-    <string-array name="live_display_entries" translatable="false">
-        <item>@string/live_display_auto</item>
-        <item>@string/live_display_off</item>
-        <item>@string/live_display_day</item>
-        <item>@string/live_display_night</item>
-        <item>@string/live_display_outdoor</item>
-    </string-array>
-
-    <string-array name="live_display_summaries" translatable="false">
-        <item>@string/live_display_auto_summary</item>
-        <item>@string/live_display_off_summary</item>
-        <item>@string/live_display_day_summary</item>
-        <item>@string/live_display_night_summary</item>
-        <item>@string/live_display_outdoor_summary</item>
-    </string-array>
-
-    <string-array name="live_display_values" translatable="false">
-        <item>2</item>
-        <item>0</item>
-        <item>4</item>
-        <item>1</item>
-        <item>3</item>
-    </string-array>
-
-
     <!-- A list of pre-installed applications that will be treated as carrier apps,
          regardless of the SIM inserted. These applications will be granted phone and
          location permissions, and must obtain user content through other means -->
diff --git a/core/res/res/values/cm_strings.xml b/core/res/res/values/cm_strings.xml
index d8f2b7c9e93..a8fcbe52024 100644
--- a/core/res/res/values/cm_strings.xml
+++ b/core/res/res/values/cm_strings.xml
@@ -192,19 +192,6 @@
     <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
     <string name="lock_to_app_toast_no_navbar">To unpin this screen, touch and hold the Back button.</string>
 
-    <!-- LiveDisplay strings -->
-    <string name="live_display_title" translatable="false">LiveDisplay</string>
-    <string name="live_display_auto">Automatic</string>
-    <string name="live_display_auto_summary">Automatically adjust color temperature of screen after sunset and sunrise</string>
-    <string name="live_display_off">Off</string>
-    <string name="live_display_off_summary">Disable all adjustments</string>
-    <string name="live_display_day">Day</string>
-    <string name="live_display_day_summary">Use day settings only</string>
-    <string name="live_display_night">Night</string>
-    <string name="live_display_night_summary">Use night settings only</string>
-    <string name="live_display_outdoor">Outdoor (bright sun)</string>
-    <string name="live_display_outdoor_summary">Use outdoor settings only</string>
-    <string name="live_display_hint">LiveDisplay can help reduce eyestrain and help you sleep at night. Click here to try it out!</string>
 
     <!-- Template for showing cellular network operator name while LTE calling is enabled -->
     <string name="high_definition_tag" translatable="false">%s</string>
diff --git a/core/res/res/values/cm_symbols.xml b/core/res/res/values/cm_symbols.xml
index a76b3c2bec0..0e517b73fe6 100644
--- a/core/res/res/values/cm_symbols.xml
+++ b/core/res/res/values/cm_symbols.xml
@@ -107,21 +107,6 @@
     <!-- Automatic brightness enhancements -->
     <java-symbol type="integer" name="config_autoBrightnessBrighteningLightFastDebounce"/>
 
-    <!-- LiveDisplay -->
-    <java-symbol type="string" name="live_display_title" />
-    <java-symbol type="string" name="live_display_hint" />
-    <java-symbol type="string" name="live_display_auto" />
-    <java-symbol type="string" name="live_display_auto_summary" />
-    <java-symbol type="string" name="live_display_day" />
-    <java-symbol type="string" name="live_display_day_summary" />
-    <java-symbol type="string" name="live_display_night" />
-    <java-symbol type="string" name="live_display_night_summary" />
-    <java-symbol type="string" name="live_display_outdoor" />
-    <java-symbol type="string" name="live_display_outdoor_summary" />
-    <java-symbol type="array" name="live_display_entries" />
-    <java-symbol type="array" name="live_display_summaries" />
-    <java-symbol type="array" name="live_display_values" />
-    <java-symbol type="integer" name="config_dayColorTemperature" />
 
     <java-symbol type="string" name="high_definition_tag" />
 
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 5cdce930b38..862968778dd 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2559,7 +2559,6 @@
     <!-- The BT name of the keyboard packaged with the device. If this is defined, SystemUI will
          automatically try to pair with it when the device exits tablet mode. -->
     <string translatable="false" name="config_packagedKeyboardName"></string>
-    <integer name="config_dayColorTemperature">6500</integer>
 
     <!-- Show battery fully charged notification -->
     <bool name="config_showBatteryFullyChargedNotification">false</bool>
diff --git a/packages/SystemUI/AndroidManifest_cm.xml b/packages/SystemUI/AndroidManifest_cm.xml
index b13ac3be400..6034b899ca7 100644
--- a/packages/SystemUI/AndroidManifest_cm.xml
+++ b/packages/SystemUI/AndroidManifest_cm.xml
@@ -47,6 +47,9 @@
     <!-- Live lock screen manager -->
     <uses-permission android:name="cyanogenmod.permission.LIVE_LOCK_SCREEN_MANAGER_ACCESS_PRIVATE" />
 
+    <!-- LiveDisplay tile -->
+    <uses-permission android:name="cyanogenmod.permission.MANAGE_LIVEDISPLAY" />
+
     <application>
         <provider android:name=".cm.SpamMessageProvider"
                   android:permission="android.permission.INTERACT_ACROSS_USERS_FULL"
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/LiveDisplayTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/LiveDisplayTile.java
index f59c8769831..e86ee04cdb5 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/LiveDisplayTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/LiveDisplayTile.java
@@ -16,6 +16,10 @@
 
 package com.android.systemui.qs.tiles;
 
+import static cyanogenmod.hardware.LiveDisplayManager.FEATURE_MANAGED_OUTDOOR_MODE;
+import static cyanogenmod.hardware.LiveDisplayManager.MODE_DAY;
+import static cyanogenmod.hardware.LiveDisplayManager.MODE_OUTDOOR;
+
 import android.content.Intent;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
@@ -27,15 +31,16 @@ import com.android.internal.util.ArrayUtils;
 import com.android.systemui.R;
 import com.android.systemui.qs.QSTile;
 
-import cyanogenmod.hardware.CMHardwareManager;
-import cyanogenmod.providers.CMSettings;
 import org.cyanogenmod.internal.logging.CMMetricsLogger;
 
+import cyanogenmod.hardware.LiveDisplayManager;
+import cyanogenmod.providers.CMSettings;
+
 /** Quick settings tile: LiveDisplay mode switcher **/
 public class LiveDisplayTile extends QSTile<LiveDisplayTile.LiveDisplayState> {
 
     private static final Intent LIVEDISPLAY_SETTINGS =
-            new Intent("android.settings.LIVEDISPLAY_SETTINGS");
+            new Intent(CMSettings.ACTION_LIVEDISPLAY_SETTINGS);
 
     private final LiveDisplayObserver mObserver;
     private String[] mEntries;
@@ -46,15 +51,13 @@ public class LiveDisplayTile extends QSTile<LiveDisplayTile.LiveDisplayState> {
 
     private boolean mListening;
 
-    private static final int MODE_OUTDOOR = 3;
-    private static final int MODE_DAY = 4;
-
-    private static final int OFF_TEMPERATURE = 6500;
-
     private int mDayTemperature;
 
     private final boolean mOutdoorModeAvailable;
-    private final int mDefaultDayTemperature;
+
+    private final LiveDisplayManager mLiveDisplay;
+
+    private static final int OFF_TEMPERATURE = 6500;
 
     public LiveDisplayTile(Host host) {
         super(host);
@@ -69,13 +72,11 @@ public class LiveDisplayTile extends QSTile<LiveDisplayTile.LiveDisplayState> {
 
         updateEntries();
 
-        mOutdoorModeAvailable =
-                CMHardwareManager.getInstance(mContext)
-                    .isSupported(CMHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT);
+        mLiveDisplay = LiveDisplayManager.getInstance(mContext);
+        mOutdoorModeAvailable = mLiveDisplay.getConfig().hasFeature(MODE_OUTDOOR) &&
+                !mLiveDisplay.getConfig().hasFeature(FEATURE_MANAGED_OUTDOOR_MODE);
 
-        mDefaultDayTemperature = mContext.getResources().getInteger(
-                com.android.internal.R.integer.config_dayColorTemperature);
-        loadDayTemperature();
+        mDayTemperature = mLiveDisplay.getDayColorTemperature();
 
         mObserver = new LiveDisplayObserver(mHandler);
         mObserver.startObserving();
@@ -83,10 +84,10 @@ public class LiveDisplayTile extends QSTile<LiveDisplayTile.LiveDisplayState> {
 
     private void updateEntries() {
         Resources res = mContext.getResources();
-        mEntries = res.getStringArray(com.android.internal.R.array.live_display_entries);
+        mEntries = res.getStringArray(org.cyanogenmod.platform.internal.R.array.live_display_entries);
         mDescriptionEntries = res.getStringArray(R.array.live_display_description);
         mAnnouncementEntries = res.getStringArray(R.array.live_display_announcement);
-        mValues = res.getStringArray(com.android.internal.R.array.live_display_values);
+        mValues = res.getStringArray(org.cyanogenmod.platform.internal.R.array.live_display_values);
     }
 
     @Override
@@ -137,10 +138,7 @@ public class LiveDisplayTile extends QSTile<LiveDisplayTile.LiveDisplayState> {
     }
 
     private int getCurrentModeIndex() {
-        return ArrayUtils.indexOf(mValues,
-                String.valueOf(CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                        CMSettings.System.DISPLAY_TEMPERATURE_MODE,
-                        0, UserHandle.USER_CURRENT)));
+        return ArrayUtils.indexOf(mValues, String.valueOf(mLiveDisplay.getMode()));
     }
 
     private void changeToNextMode() {
@@ -150,13 +148,14 @@ public class LiveDisplayTile extends QSTile<LiveDisplayTile.LiveDisplayState> {
             next = 0;
         }
 
+        int nextMode = 0;
+
         while (true) {
+            nextMode = Integer.valueOf(mValues[next]);
             // Skip outdoor mode if it's unsupported, and skip the day setting
             // if it's the same as the off setting
-            if ((!mOutdoorModeAvailable &&
-                    Integer.valueOf(mValues[next]) == MODE_OUTDOOR) ||
-                    (mDayTemperature == OFF_TEMPERATURE &&
-                    Integer.valueOf(mValues[next]) == MODE_DAY)) {
+            if ((!mOutdoorModeAvailable && nextMode == MODE_OUTDOOR) ||
+                    (mDayTemperature == OFF_TEMPERATURE && nextMode == MODE_DAY)) {
                 next++;
                 if (next >= mValues.length) {
                     next = 0;
@@ -166,16 +165,7 @@ public class LiveDisplayTile extends QSTile<LiveDisplayTile.LiveDisplayState> {
             }
         }
 
-        CMSettings.System.putIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_MODE,
-                Integer.valueOf(mValues[next]), UserHandle.USER_CURRENT);
-    }
-
-    private void loadDayTemperature() {
-        mDayTemperature = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_DAY,
-                mDefaultDayTemperature,
-                UserHandle.USER_CURRENT);
+        mLiveDisplay.setMode(nextMode);
     }
 
     private class LiveDisplayObserver extends ContentObserver {
@@ -185,7 +175,7 @@ public class LiveDisplayTile extends QSTile<LiveDisplayTile.LiveDisplayState> {
 
         @Override
         public void onChange(boolean selfChange) {
-            loadDayTemperature();
+            mDayTemperature = mLiveDisplay.getDayColorTemperature();
             refreshState(getCurrentModeIndex());
         }
 
diff --git a/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java b/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java
index 1b4182dbb32..4e4c249f360 100644
--- a/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java
+++ b/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java
@@ -31,7 +31,7 @@ import cyanogenmod.providers.CMSettings;
 /**
  * Utility methods for performing accessibility display adjustments.
  */
-public class DisplayAdjustmentUtils {
+class DisplayAdjustmentUtils {
     private static final String LOG_TAG = DisplayAdjustmentUtils.class.getSimpleName();
 
     /** Matrix and offset used for converting color to gray-scale. */
@@ -77,11 +77,6 @@ public class DisplayAdjustmentUtils {
             return true;
         }
 
-        if (CMSettings.Secure.getStringForUser(cr,
-                CMSettings.Secure.LIVE_DISPLAY_COLOR_MATRIX, userId) != null) {
-            return true;
-        }
-
         return false;
     }
 
@@ -97,23 +92,6 @@ public class DisplayAdjustmentUtils {
             colorMatrix = multiply(colorMatrix, INVERSION_MATRIX_VALUE_ONLY);
         }
 
-        String adj = CMSettings.Secure.getStringForUser(cr,
-                CMSettings.Secure.LIVE_DISPLAY_COLOR_MATRIX, userId);
-        if (adj != null) {
-            String[] tmp = adj.split(" ");
-            if (tmp.length == 16) {
-                float[] adjMatrix = new float[16];
-                try {
-                    for (int i = 0; i < 16; i++) {
-                        adjMatrix[i] = Float.parseFloat(tmp[i]);
-                    }
-                    colorMatrix = multiply(colorMatrix, adjMatrix);
-                } catch (NumberFormatException e) {
-                    Slog.e(LOG_TAG, e.getMessage(), e);
-                }
-            }
-        }
-
         if (Settings.Secure.getIntForUser(cr,
                 Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, 0, userId) != 0) {
             final int daltonizerMode = Settings.Secure.getIntForUser(cr,
diff --git a/services/core/java/com/android/server/display/AutomaticBrightnessController.java b/services/core/java/com/android/server/display/AutomaticBrightnessController.java
index 1925ed35738..eca6a2e7c19 100644
--- a/services/core/java/com/android/server/display/AutomaticBrightnessController.java
+++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java
@@ -194,9 +194,6 @@ class AutomaticBrightnessController {
     private int mBrightnessAdjustmentSampleOldBrightness;
     private float mBrightnessAdjustmentSampleOldGamma;
 
-    // Night mode color temperature adjustments
-    private final LiveDisplayController mLiveDisplay;
-
     // Period of time in which to consider light samples in milliseconds.
     private int mAmbientLightHorizon;
 
@@ -212,7 +209,7 @@ class AutomaticBrightnessController {
             int lightSensorRate, long brighteningLightDebounceConfig,
             long brighteningLightFastDebounceConfig, long darkeningLightDebounceConfig,
             boolean resetAmbientLuxAfterWarmUpConfig,
-            int ambientLightHorizon, LiveDisplayController ldc) {
+            int ambientLightHorizon) {
         mContext = context;
         mCallbacks = callbacks;
         mTwilight = LocalServices.getService(TwilightManager.class);
@@ -227,7 +224,6 @@ class AutomaticBrightnessController {
         mBrighteningLightFastDebounceConfig = brighteningLightFastDebounceConfig;
         mDarkeningLightDebounceConfig = darkeningLightDebounceConfig;
         mResetAmbientLuxAfterWarmUpConfig = resetAmbientLuxAfterWarmUpConfig;
-        mLiveDisplay = ldc;
         mAmbientLightHorizon = ambientLightHorizon;
         mWeightingIntercept = ambientLightHorizon;
 
@@ -503,9 +499,6 @@ class AutomaticBrightnessController {
             }
         }
 
-        // Update LiveDisplay with the current lux
-        mLiveDisplay.updateLiveDisplay(mAmbientLux);
-
         if (USE_TWILIGHT_ADJUSTMENT) {
             TwilightState state = mTwilight.getCurrentState();
             if (state != null && state.isNight()) {
diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java
index e8a857bb075..6a6570b9720 100644
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -287,8 +287,6 @@ public final class DisplayManagerService extends SystemService {
             mOnlyCore = onlyCore;
         }
 
-        mDisplayPowerController.systemReady();
-
         mHandler.sendEmptyMessage(MSG_REGISTER_ADDITIONAL_DISPLAY_ADAPTERS);
     }
 
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index ae596cb9f58..25e59d55341 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -251,9 +251,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
     // The controller for the automatic brightness level.
     private AutomaticBrightnessController mAutomaticBrightnessController;
 
-    // The controller for LiveDisplay
-    private final LiveDisplayController mLiveDisplayController;
-
     // Animators.
     private ObjectAnimator mColorFadeOnAnimator;
     private ObjectAnimator mColorFadeOffAnimator;
@@ -275,8 +272,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
         mBlanker = blanker;
         mContext = context;
 
-        mLiveDisplayController = new LiveDisplayController(context, handler.getLooper());
-
         final Resources resources = context.getResources();
         final int screenBrightnessSettingMinimum = clampAbsoluteBrightness(resources.getInteger(
                 com.android.internal.R.integer.config_screenBrightnessSettingMinimum));
@@ -363,7 +358,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
                         mScreenBrightnessRangeMaximum, dozeScaleFactor, lightSensorRate,
                         brighteningLightDebounce, brighteningLightFastDebounce,
                         darkeningLightDebounce, autoBrightnessResetAmbientLuxAfterWarmUp,
-                        ambientLightHorizon, mLiveDisplayController);
+                        ambientLightHorizon);
             }
         }
 
@@ -716,9 +711,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
             }
         }
 
-        // Update LiveDisplay now
-        mLiveDisplayController.updateLiveDisplay();
-
         // Determine whether the display is ready for use in the newly requested state.
         // Note that we do not wait for the brightness ramp animation to complete before
         // reporting the display is ready because we only need to ensure the screen is in the
@@ -1157,8 +1149,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
         if (mAutomaticBrightnessController != null) {
             mAutomaticBrightnessController.dump(pw);
         }
-
-        mLiveDisplayController.dump(pw);
     }
 
     private static String proximityToString(int state) {
@@ -1220,10 +1210,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
         return MathUtils.constrain(value, PowerManager.BRIGHTNESS_OFF, PowerManager.BRIGHTNESS_ON);
     }
 
-    void systemReady() {
-        mLiveDisplayController.systemReady();
-    }
-
     private final class DisplayControllerHandler extends Handler {
         public DisplayControllerHandler(Looper looper) {
             super(looper, null, true /*async*/);
diff --git a/services/core/java/com/android/server/display/LiveDisplayController.java b/services/core/java/com/android/server/display/LiveDisplayController.java
deleted file mode 100644
index 28f24325a34..00000000000
--- a/services/core/java/com/android/server/display/LiveDisplayController.java
+++ /dev/null
@@ -1,650 +0,0 @@
-/*
- * Copyright (C) 2015 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.android.server.display;
-
-import android.animation.ValueAnimator;
-import android.animation.ValueAnimator.AnimatorUpdateListener;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Looper;
-import android.os.Message;
-import android.os.Parcel;
-import android.os.PowerManagerInternal;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.text.format.DateUtils;
-import android.util.MathUtils;
-import android.util.Slog;
-
-import com.android.server.LocalServices;
-import com.android.server.accessibility.DisplayAdjustmentUtils;
-import com.android.server.pm.UserContentObserver;
-import com.android.server.twilight.TwilightListener;
-import com.android.server.twilight.TwilightManager;
-import com.android.server.twilight.TwilightState;
-
-import cyanogenmod.hardware.CMHardwareManager;
-import cyanogenmod.providers.CMSettings;
-import cyanogenmod.util.ColorUtils;
-
-import java.io.PrintWriter;
-import java.util.List;
-
-public class LiveDisplayController {
-
-    private static final String TAG = "LiveDisplay";
-
-    private static final String DELIMITER = "|";
-    private static final long TWILIGHT_ADJUSTMENT_TIME = DateUtils.HOUR_IN_MILLIS * 1;
-
-    private static final int OFF_TEMPERATURE = 6500;
-
-    public static final int MODE_OFF = 0;
-    public static final int MODE_NIGHT = 1;
-    public static final int MODE_AUTO = 2;
-    public static final int MODE_OUTDOOR = 3;
-    public static final int MODE_DAY = 4;
-
-    private int mColorTemperature = OFF_TEMPERATURE;
-    private float mCurrentLux = 0.0f;
-
-    private int mHintCounter;
-    private int mMode;
-
-    private boolean mOutdoorMode;
-    private boolean mColorEnhancement;
-    private boolean mLowPower;
-
-    private final Context mContext;
-    private final Handler mHandler;
-
-    private CMHardwareManager mHardware;
-
-    private int mDayTemperature;
-    private int mNightTemperature;
-
-    private boolean mUseOutdoorMode;
-    private boolean mUseColorEnhancement;
-    private boolean mUseLowPower;
-
-    private boolean mOutdoorModeIsSelfManaged;
-
-    private final float[] mColorAdjustment = new float[] { 1.0f, 1.0f, 1.0f };
-    private final float[] mRGB = new float[] { 0.0f, 0.0f, 0.0f };
-
-    private TwilightManager mTwilightManager;
-    private boolean mSunset = false;
-
-    private SettingsObserver mObserver;
-
-    private ValueAnimator mAnimator;
-
-    private int mDefaultDayTemperature;
-    private int mDefaultNightTemperature;
-    private int mDefaultOutdoorLux;
-
-    private boolean mInitialized = false;
-
-    private static final int MSG_UPDATE_LIVE_DISPLAY = 1;
-
-    // Display postprocessing can have power impact. Disable it if powersave mode is on.
-    private boolean mLowPerformance = false;
-    private PowerManagerInternal.LowPowerModeListener mLowPowerModeListener =
-            new PowerManagerInternal.LowPowerModeListener() {
-        @Override
-        public void onLowPowerModeChanged(boolean enabled) {
-            mLowPerformance = enabled;
-            updateLiveDisplay(mCurrentLux);
-         }
-    };
-
-    LiveDisplayController(Context context, Looper looper) {
-        mContext = context;
-        mHandler = new LiveDisplayHandler(looper);
-    }
-
-    void systemReady() {
-        mHardware = CMHardwareManager.getInstance(mContext);
-
-        mDefaultDayTemperature = mContext.getResources().getInteger(
-                org.cyanogenmod.platform.internal.R.integer.config_dayColorTemperature);
-        mDefaultNightTemperature = mContext.getResources().getInteger(
-                org.cyanogenmod.platform.internal.R.integer.config_nightColorTemperature);
-        mDefaultOutdoorLux = mContext.getResources().getInteger(
-                org.cyanogenmod.platform.internal.R.integer.config_outdoorAmbientLux);
-
-        mUseOutdoorMode =
-                mHardware.isSupported(CMHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT);
-        mOutdoorModeIsSelfManaged = mUseOutdoorMode ?
-                mHardware.isSunlightEnhancementSelfManaged() : false;
-
-        mUseLowPower =
-                mHardware.isSupported(CMHardwareManager.FEATURE_ADAPTIVE_BACKLIGHT);
-        if (mUseLowPower) {
-            mLowPower = mHardware.get(CMHardwareManager.FEATURE_ADAPTIVE_BACKLIGHT);
-        }
-
-        mUseColorEnhancement =
-                mHardware.isSupported(CMHardwareManager.FEATURE_COLOR_ENHANCEMENT);
-        if (mUseColorEnhancement) {
-            mColorEnhancement =
-                mHardware.get(CMHardwareManager.FEATURE_COLOR_ENHANCEMENT);
-        }
-
-        updateSettings();
-
-        mObserver = new SettingsObserver();
-        mObserver.register(true);
-
-        PowerManagerInternal pmi = LocalServices.getService(PowerManagerInternal.class);
-        pmi.registerLowPowerModeObserver(mLowPowerModeListener);
-        mLowPerformance = pmi.getLowPowerModeEnabled();
-
-        mTwilightManager = LocalServices.getService(TwilightManager.class);
-        mTwilightManager.registerListener(mTwilightListener, mHandler);
-
-        mInitialized = true;
-    }
-
-    private void updateSettings() {
-        mDayTemperature = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_DAY,
-                mDefaultDayTemperature,
-                UserHandle.USER_CURRENT);
-        mNightTemperature = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_NIGHT,
-                mDefaultNightTemperature,
-                UserHandle.USER_CURRENT);
-        mMode = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_MODE,
-                MODE_OFF,
-                UserHandle.USER_CURRENT);
-        // Counter used to determine when we should tell the user about this feature.
-        // If it's not used after 3 sunsets, we'll show the hint once.
-        mHintCounter = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.LIVE_DISPLAY_HINTED,
-                -3,
-                UserHandle.USER_CURRENT);
-
-        // Clear the hint forever
-        if (mMode != MODE_OFF) {
-            saveUserHint(1);
-        }
-
-        // Manual color adjustment will be set as a space separated string of float values
-        String colorAdjustmentTemp = CMSettings.System.getStringForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_COLOR_ADJUSTMENT,
-                UserHandle.USER_CURRENT);
-        String[] colorAdjustment = colorAdjustmentTemp == null ?
-                null : colorAdjustmentTemp.split(" ");
-        if (colorAdjustment == null || colorAdjustment.length != 3) {
-            colorAdjustment = new String[] { "1.0", "1.0", "1.0" };
-        }
-        try {
-            mColorAdjustment[0] = Float.parseFloat(colorAdjustment[0]);
-            mColorAdjustment[1] = Float.parseFloat(colorAdjustment[1]);
-            mColorAdjustment[2] = Float.parseFloat(colorAdjustment[2]);
-        } catch (NumberFormatException e) {
-            Slog.e(TAG, e.getMessage(), e);
-            mColorAdjustment[0] = 1.0f;
-            mColorAdjustment[1] = 1.0f;
-            mColorAdjustment[2] = 1.0f;
-        }
-
-        updateLiveDisplay(mCurrentLux);
-        updateGamma();
-    }
-
-    private void updateGamma() {
-        if (!mHardware.isSupported(CMHardwareManager.FEATURE_DISPLAY_GAMMA_CALIBRATION)) {
-            return;
-        }
-        ContentResolver contentResolver = mContext.getContentResolver();
-        for (int i = 0; i < mHardware.getNumGammaControls(); i++) {
-            List<String> gammaValue = CMSettings.Secure.getDelimitedStringAsList(
-                    contentResolver, DELIMITER,
-                    CMSettings.Secure.DISPLAY_GAMMA_CALIBRATION_PREFIX + i);
-            if (gammaValue != null) {
-                mHardware.setDisplayGammaCalibration(i, stringArrayToIntArray(gammaValue));
-            }
-        }
-    }
-
-    private int[] stringArrayToIntArray(List<String> value) {
-        int[] result = new int[value.size()];
-        for (int i = 0; i < value.size(); i++) {
-            result[i] = Integer.parseInt(value.get(i));
-        }
-        return result;
-    }
-
-    private final class SettingsObserver extends UserContentObserver {
-        private final Uri DISPLAY_TEMPERATURE_DAY_URI =
-                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_TEMPERATURE_DAY);
-        private final Uri DISPLAY_TEMPERATURE_NIGHT_URI =
-                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_TEMPERATURE_NIGHT);
-        private final Uri DISPLAY_TEMPERATURE_MODE_URI =
-                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_TEMPERATURE_MODE);
-        private final Uri DISPLAY_AUTO_OUTDOOR_MODE_URI =
-                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_AUTO_OUTDOOR_MODE);
-        private final Uri DISPLAY_LOW_POWER_URI =
-                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_LOW_POWER);
-        private final Uri DISPLAY_COLOR_ENHANCE_URI =
-                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_COLOR_ENHANCE);
-        private final Uri DISPLAY_COLOR_ADJUSTMENT_URI =
-                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_COLOR_ADJUSTMENT);
-        public SettingsObserver() {
-            super(mHandler);
-        }
-
-        public void register(boolean register) {
-            final ContentResolver cr = mContext.getContentResolver();
-            if (register) {
-                cr.registerContentObserver(DISPLAY_TEMPERATURE_DAY_URI, false, this, UserHandle.USER_ALL);
-                cr.registerContentObserver(DISPLAY_TEMPERATURE_NIGHT_URI, false, this, UserHandle.USER_ALL);
-                cr.registerContentObserver(DISPLAY_TEMPERATURE_MODE_URI, false, this, UserHandle.USER_ALL);
-                cr.registerContentObserver(DISPLAY_AUTO_OUTDOOR_MODE_URI, false, this, UserHandle.USER_ALL);
-                cr.registerContentObserver(DISPLAY_LOW_POWER_URI, false, this, UserHandle.USER_ALL);
-                cr.registerContentObserver(DISPLAY_COLOR_ENHANCE_URI, false, this, UserHandle.USER_ALL);
-                cr.registerContentObserver(DISPLAY_COLOR_ADJUSTMENT_URI, false, this, UserHandle.USER_ALL);
-                if (mHardware.isSupported(CMHardwareManager.FEATURE_DISPLAY_GAMMA_CALIBRATION)) {
-                    for (int i = 0; i < mHardware.getNumGammaControls(); i++) {
-                        Uri gammaUri = CMSettings.Secure.getUriFor(
-                                CMSettings.Secure.DISPLAY_GAMMA_CALIBRATION_PREFIX + i);
-                        cr.registerContentObserver(gammaUri, false, this, UserHandle.USER_ALL);
-                    }
-                }
-                observe();
-            } else {
-                cr.unregisterContentObserver(this);
-                unobserve();
-            }
-        }
-
-        @Override
-        protected void update() {
-            updateSettings();
-        }
-    }
-
-    public void updateLiveDisplay() {
-        updateLiveDisplay(mCurrentLux);
-    }
-
-    synchronized void updateLiveDisplay(float lux) {
-        mCurrentLux = lux;
-        mHandler.removeMessages(MSG_UPDATE_LIVE_DISPLAY);
-        mHandler.sendEmptyMessage(MSG_UPDATE_LIVE_DISPLAY);
-    }
-
-    private synchronized void updateColorTemperature(TwilightState twilight) {
-        int temperature = mDayTemperature;
-        if (mMode == MODE_OFF || mLowPerformance) {
-            temperature = OFF_TEMPERATURE;
-        } else if (mMode == MODE_NIGHT) {
-            temperature = mNightTemperature;
-        } else if (mMode == MODE_AUTO) {
-            temperature = getTwilightK(twilight);
-        }
-
-        if (mAnimator != null) {
-            mAnimator.cancel();
-        }
-        mAnimator = ValueAnimator.ofInt(mColorTemperature, temperature);
-        mAnimator.setDuration(Math.abs(mColorTemperature - temperature) / 2);
-        mAnimator.addUpdateListener(new AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator animation) {
-                setDisplayTemperature((Integer)animation.getAnimatedValue());
-            }
-        });
-        mAnimator.start();
-    }
-
-    private synchronized void setDisplayTemperature(int temperature) {
-        mColorTemperature = temperature;
-
-        final float[] rgb = ColorUtils.temperatureToRGB(temperature);
-
-        if (!mLowPerformance) {
-            rgb[0] *= mColorAdjustment[0];
-            rgb[1] *= mColorAdjustment[1];
-            rgb[2] *= mColorAdjustment[2];
-        }
-
-        if (rgb[0] == mRGB[0] && rgb[1] == mRGB[1] && rgb[2] == mRGB[2]) {
-            // no changes
-            return;
-        }
-
-        System.arraycopy(rgb, 0, mRGB, 0, 3);
-
-        Slog.d(TAG, "Adjust display temperature to " + temperature +
-                "K [r=" + rgb[0] + " g=" + rgb[1] + " b=" + rgb[2] + "]");
-
-        if (mHardware.isSupported(CMHardwareManager.FEATURE_DISPLAY_COLOR_CALIBRATION)) {
-            // Clear this out in case of an upgrade
-            CMSettings.Secure.putStringForUser(mContext.getContentResolver(),
-                    CMSettings.Secure.LIVE_DISPLAY_COLOR_MATRIX,
-                    null,
-                    UserHandle.USER_CURRENT);
-
-            int max = mHardware.getDisplayColorCalibrationMax();
-            mHardware.setDisplayColorCalibration(new int[] {
-                (int) Math.ceil(rgb[0] * max),
-                (int) Math.ceil(rgb[1] * max),
-                (int) Math.ceil(rgb[2] * max)
-            });
-            screenRefresh();
-        } else {
-            String colorMatrixStr = null;
-            if (rgb[0] != 1.0f || rgb[1] != 1.0f || rgb[2] != 1.0f) {
-                 final Float[] colorMatrix = new Float[] {
-                        rgb[0], 0.0f, 0.0f, 0.0f,
-                        0.0f, rgb[1], 0.0f, 0.0f,
-                        0.0f, 0.0f, rgb[2], 0.0f,
-                        0.0f, 0.0f, 0.0f, 1.0f };
-                 colorMatrixStr = TextUtils.join(" ", colorMatrix);
-            }
-
-            // For GPU color transform, go thru DisplayAdjustmentUtils in
-            // order to coexist with accessibility settings
-            CMSettings.Secure.putStringForUser(mContext.getContentResolver(),
-                    CMSettings.Secure.LIVE_DISPLAY_COLOR_MATRIX,
-                    colorMatrixStr,
-                    UserHandle.USER_CURRENT);
-
-           DisplayAdjustmentUtils.applyAdjustments(mContext, UserHandle.USER_CURRENT);
-        }
-    }
-
-    /**
-     * Outdoor mode is optionally enabled when ambient lux > 10000 and it's daytime
-     * Melt faces!
-     *
-     * TODO: Use the camera or RGB sensor to determine if it's really sunlight
-     */
-    private synchronized void updateOutdoorMode(TwilightState twilight) {
-        if (!mUseOutdoorMode) {
-            return;
-        }
-
-        boolean value = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_AUTO_OUTDOOR_MODE,
-                1,
-                UserHandle.USER_CURRENT) == 1;
-
-        boolean enabled;
-        if (mOutdoorModeIsSelfManaged) {
-            enabled = value;
-        } else {
-            enabled = !mLowPerformance &&
-                ((mMode == MODE_OUTDOOR) ||
-                 (value && mMode == MODE_AUTO &&
-                  twilight != null && !twilight.isNight() &&
-                  mCurrentLux > mDefaultOutdoorLux));
-        }
-
-        if (enabled == mOutdoorMode) {
-            return;
-        }
-
-        mHardware.set(CMHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT, enabled);
-        mOutdoorMode = enabled;
-    }
-
-    /**
-     * Color enhancement is optional, but can look bad with night mode
-     */
-    private synchronized void updateColorEnhancement(TwilightState twilight) {
-        if (!mUseColorEnhancement) {
-            return;
-        }
-
-        boolean value = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_COLOR_ENHANCE,
-                1,
-                UserHandle.USER_CURRENT) == 1;
-
-        boolean enabled = !mLowPerformance && value &&
-                !(mMode == MODE_NIGHT ||
-                 (mMode == MODE_AUTO && twilight != null && twilight.isNight()));
-
-        if (enabled == mColorEnhancement) {
-            return;
-        }
-
-        mHardware.set(CMHardwareManager.FEATURE_COLOR_ENHANCEMENT, enabled);
-        mColorEnhancement = enabled;
-    }
-
-    /**
-     * Adaptive backlight / low power mode. Turn it off when under very bright light.
-     */
-    private synchronized void updateLowPowerMode() {
-        if (!mUseLowPower) {
-            return;
-        }
-
-        boolean value = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_LOW_POWER,
-                1,
-                UserHandle.USER_CURRENT) == 1;
-
-        boolean enabled = value && (mCurrentLux < mDefaultOutdoorLux);
-
-        if (enabled == mLowPower) {
-            return;
-        }
-
-        mHardware.set(CMHardwareManager.FEATURE_ADAPTIVE_BACKLIGHT, enabled);
-        mLowPower = enabled;
-    }
-
-    /**
-     * Where is the sun anyway? This calculation determines day or night, and scales
-     * the value around sunset/sunrise for a smooth transition.
-     *
-     * @param now
-     * @param sunset
-     * @param sunrise
-     * @return float between 0 and 1
-     */
-    private static float adj(long now, long sunset, long sunrise) {
-        if (sunset < 0 || sunrise < 0
-                || now < sunset || now > sunrise) {
-            return 1.0f;
-        }
-
-        if (now < sunset + TWILIGHT_ADJUSTMENT_TIME) {
-            return MathUtils.lerp(1.0f, 0.0f,
-                    (float)(now - sunset) / TWILIGHT_ADJUSTMENT_TIME);
-        }
-
-        if (now > sunrise - TWILIGHT_ADJUSTMENT_TIME) {
-            return MathUtils.lerp(1.0f, 0.0f,
-                    (float)(sunrise - now) / TWILIGHT_ADJUSTMENT_TIME);
-        }
-
-        return 0.0f;
-    }
-
-    /**
-     * Determine the color temperature we should use for the display based on
-     * the position of the sun.
-     *
-     * @param state
-     * @return color temperature in Kelvin
-     */
-    private int getTwilightK(TwilightState state) {
-        float adjustment = 1.0f;
-
-        if (state != null) {
-            final long now = System.currentTimeMillis();
-            adjustment = adj(now, state.getYesterdaySunset(), state.getTodaySunrise()) *
-                         adj(now, state.getTodaySunset(), state.getTomorrowSunrise());
-        }
-
-        return (int)MathUtils.lerp(mNightTemperature, mDayTemperature, adjustment);
-    }
-
-    /**
-     * Tell SurfaceFlinger to repaint the screen. This is called after updating
-     * hardware registers for display calibration to have an immediate effect.
-     */
-    private static void screenRefresh() {
-        try {
-            final IBinder flinger = ServiceManager.getService("SurfaceFlinger");
-            if (flinger != null) {
-                final Parcel data = Parcel.obtain();
-                data.writeInterfaceToken("android.ui.ISurfaceComposer");
-                flinger.transact(1004, data, null, 0);
-                data.recycle();
-            }
-        } catch (RemoteException ex) {
-            Slog.e(TAG, "Failed to refresh screen", ex);
-        }
-    }
-
-    private void saveUserHint(int value) {
-        if (mHintCounter == value) {
-            return;
-        }
-        CMSettings.System.putIntForUser(mContext.getContentResolver(),
-                CMSettings.System.LIVE_DISPLAY_HINTED,
-                value,
-                UserHandle.USER_CURRENT);
-        mHintCounter = value;
-    }
-
-    /**
-     * Show a friendly notification to the user about the potential benefits of decreasing
-     * blue light at night. Do this only once if the feature has not been used after
-     * three sunsets. It would be great to enable this by default, but we don't want
-     * the change of screen color to be considered a "bug" by a user who doesn't
-     * understand what's happening.
-     *
-     * @param state
-     */
-    private void updateUserHint(TwilightState state) {
-        // check if we should send the hint only once after sunset
-        if (state == null || mHintCounter == 1) {
-            return;
-        }
-        boolean transition = state.isNight() && !mSunset;
-        mSunset = state.isNight();
-        if (!transition) {
-            return;
-        }
-
-        if (mHintCounter <= 0) {
-            mHintCounter++;
-            saveUserHint(mHintCounter);
-        }
-        if (mHintCounter == 0) {
-            //show the notification and don't come back here
-            final Intent intent = new Intent("android.settings.LIVEDISPLAY_SETTINGS");
-            PendingIntent result = PendingIntent.getActivity(
-                    mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-            Notification.Builder builder = new Notification.Builder(mContext)
-                    .setContentTitle(mContext.getResources().getString(
-                            org.cyanogenmod.platform.internal.R.string.live_display_title))
-                    .setContentText(mContext.getResources().getString(
-                            org.cyanogenmod.platform.internal.R.string.live_display_hint))
-                    .setSmallIcon(org.cyanogenmod.platform.internal.R.drawable.ic_livedisplay_notif)
-                    .setStyle(new Notification.BigTextStyle().bigText(mContext.getResources()
-                             .getString(
-                                     org.cyanogenmod.platform.internal.R.string.live_display_hint)))
-                    .setContentIntent(result)
-                    .setAutoCancel(true);
-
-            NotificationManager nm =
-                    (NotificationManager)mContext.getSystemService(Context.NOTIFICATION_SERVICE);
-            nm.notifyAsUser(null, 1, builder.build(), UserHandle.CURRENT);
-
-            saveUserHint(1);
-        }
-    }
-
-    private final TwilightListener mTwilightListener = new TwilightListener() {
-        @Override
-        public void onTwilightStateChanged() {
-            updateLiveDisplay(mCurrentLux);
-        }
-    };
-
-    private final class LiveDisplayHandler extends Handler {
-        public LiveDisplayHandler(Looper looper) {
-            super(looper, null, true /*async*/);
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case MSG_UPDATE_LIVE_DISPLAY:
-                    if (!mInitialized) {
-                        break;
-                    }
-                    TwilightState twilight = mTwilightManager.getCurrentState();
-
-                    updateColorTemperature(twilight);
-                    updateOutdoorMode(twilight);
-                    updateColorEnhancement(twilight);
-                    updateLowPowerMode();
-                    updateUserHint(twilight);
-
-                    boolean transition = mMode == MODE_AUTO &&
-                            mColorTemperature != mDayTemperature &&
-                            mColorTemperature != mNightTemperature;
-                    if (transition) {
-                        // fire again in a minute
-                        sendEmptyMessageDelayed(MSG_UPDATE_LIVE_DISPLAY,
-                                DateUtils.MINUTE_IN_MILLIS);
-                    }
-                    break;
-            }
-        }
-    }
-
-    public void dump(PrintWriter pw) {
-        pw.println();
-        pw.println("LiveDisplay Controller Configuration:");
-        pw.println("  mDayTemperature=" + mDayTemperature);
-        pw.println("  mNightTemperature=" + mNightTemperature);
-        pw.println();
-        pw.println("LiveDisplay Controller State:");
-        pw.println("  mMode=" + (mLowPerformance ? "disabled in powersave mode" : mMode));
-        pw.println("  mSunset=" + mSunset);
-        pw.println("  mColorTemperature=" + mColorTemperature);
-        pw.println("  mColorAdjustment=[r: " + mColorAdjustment[0] + " g:" + mColorAdjustment[1] +
-                " b:" + mColorAdjustment[2] + "]");
-        pw.println("  mRGB=[r:" + mRGB[0] + " g:" + mRGB[1] + " b:" + mRGB[2] + "]");
-        pw.println("  mOutdoorMode=" + (mUseOutdoorMode ? mOutdoorMode : "N/A"));
-        pw.println("  mColorEnhancement=" + (mUseColorEnhancement ? mColorEnhancement : "N/A"));
-        pw.println("  mLowPower=" + (mUseLowPower ? mLowPower : "N/A"));
-    }
-}