From 4a54c554cf1d1b15e0ee566e91223719b15ea346 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Thu, 31 Mar 2016 11:25:53 -0700 Subject: 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 --- core/res/res/values-af/cm_strings.xml | 12 - core/res/res/values-am/cm_strings.xml | 1 - core/res/res/values-ar/cm_strings.xml | 12 - core/res/res/values-as-rIN/cm_strings.xml | 12 - core/res/res/values-ast-rES/cm_strings.xml | 12 - core/res/res/values-az-rAZ/cm_strings.xml | 12 - core/res/res/values-be/cm_strings.xml | 12 - core/res/res/values-bg/cm_strings.xml | 12 - core/res/res/values-bn-rBD/cm_strings.xml | 8 - core/res/res/values-br-rFR/cm_strings.xml | 1 - core/res/res/values-ca/cm_strings.xml | 12 - core/res/res/values-cs/cm_strings.xml | 12 - core/res/res/values-cy/cm_strings.xml | 1 - core/res/res/values-da/cm_strings.xml | 12 - core/res/res/values-de/cm_strings.xml | 12 - core/res/res/values-el/cm_strings.xml | 12 - core/res/res/values-en-rAU/cm_strings.xml | 12 - core/res/res/values-en-rGB/cm_strings.xml | 1 - core/res/res/values-en-rIN/cm_strings.xml | 12 - core/res/res/values-en-rPT/cm_strings.xml | 1 - core/res/res/values-eo/cm_strings.xml | 12 - core/res/res/values-es-rMX/cm_strings.xml | 1 - core/res/res/values-es-rUS/cm_strings.xml | 12 - core/res/res/values-es/cm_strings.xml | 12 - core/res/res/values-et-rEE/cm_strings.xml | 12 - core/res/res/values-eu-rES/cm_strings.xml | 12 - core/res/res/values-fa/cm_strings.xml | 12 - core/res/res/values-fi/cm_strings.xml | 12 - core/res/res/values-fil-rPH/cm_strings.xml | 1 - core/res/res/values-fr-rCA/cm_strings.xml | 1 - core/res/res/values-fr/cm_strings.xml | 12 - core/res/res/values-frp-rIT/cm_strings.xml | 1 - core/res/res/values-fy-rNL/cm_strings.xml | 1 - core/res/res/values-gd-rGB/cm_strings.xml | 1 - core/res/res/values-gl-rES/cm_strings.xml | 12 - core/res/res/values-gu-rIN/cm_strings.xml | 12 - core/res/res/values-hi/cm_strings.xml | 12 - core/res/res/values-hr/cm_strings.xml | 12 - core/res/res/values-hu/cm_strings.xml | 12 - core/res/res/values-hy-rAM/cm_strings.xml | 1 - core/res/res/values-in/cm_strings.xml | 1 - core/res/res/values-is-rIS/cm_strings.xml | 1 - core/res/res/values-it/cm_strings.xml | 12 - core/res/res/values-iw/cm_strings.xml | 12 - core/res/res/values-ja/cm_strings.xml | 12 - core/res/res/values-ka-rGE/cm_strings.xml | 1 - core/res/res/values-kk-rKZ/cm_strings.xml | 1 - core/res/res/values-km-rKH/cm_strings.xml | 1 - core/res/res/values-kn-rIN/cm_strings.xml | 12 - core/res/res/values-ko/cm_strings.xml | 12 - core/res/res/values-ku/cm_strings.xml | 9 - core/res/res/values-ky-rKG/cm_strings.xml | 1 - core/res/res/values-lb/cm_strings.xml | 12 - core/res/res/values-lo-rLA/cm_strings.xml | 1 - core/res/res/values-lt/cm_strings.xml | 12 - core/res/res/values-lv/cm_strings.xml | 1 - core/res/res/values-mk-rMK/cm_strings.xml | 1 - core/res/res/values-ml-rIN/cm_strings.xml | 12 - core/res/res/values-mn-rMN/cm_strings.xml | 1 - core/res/res/values-mr-rIN/cm_strings.xml | 12 - core/res/res/values-ms-rMY/cm_strings.xml | 1 - core/res/res/values-my-rMM/cm_strings.xml | 1 - core/res/res/values-nb/cm_strings.xml | 12 - core/res/res/values-ne-rNP/cm_strings.xml | 1 - core/res/res/values-nl/cm_strings.xml | 12 - core/res/res/values-oc-rFR/cm_strings.xml | 1 - core/res/res/values-or-rIN/cm_strings.xml | 12 - core/res/res/values-pa-rIN/cm_strings.xml | 1 - core/res/res/values-pl/cm_strings.xml | 12 - core/res/res/values-pt-rBR/cm_strings.xml | 12 - core/res/res/values-pt-rPT/cm_strings.xml | 12 - core/res/res/values-rm/cm_strings.xml | 1 - core/res/res/values-ro/cm_strings.xml | 12 - core/res/res/values-ru/cm_strings.xml | 12 - core/res/res/values-si-rLK/cm_strings.xml | 1 - core/res/res/values-sk/cm_strings.xml | 12 - core/res/res/values-sl/cm_strings.xml | 12 - core/res/res/values-sq-rAL/cm_strings.xml | 1 - core/res/res/values-sr/cm_strings.xml | 12 - core/res/res/values-sv/cm_strings.xml | 12 - core/res/res/values-sw/cm_strings.xml | 1 - core/res/res/values-ta-rIN/cm_strings.xml | 12 - core/res/res/values-te-rIN/cm_strings.xml | 12 - core/res/res/values-th/cm_strings.xml | 12 - core/res/res/values-tr/cm_strings.xml | 12 - core/res/res/values-ug/cm_strings.xml | 12 - core/res/res/values-uk/cm_strings.xml | 12 - core/res/res/values-ur-rPK/cm_strings.xml | 1 - core/res/res/values-uz-rUZ/cm_strings.xml | 1 - core/res/res/values-vi/cm_strings.xml | 12 - core/res/res/values-zh-rCN/cm_strings.xml | 12 - core/res/res/values-zh-rHK/cm_strings.xml | 12 - core/res/res/values-zh-rTW/cm_strings.xml | 12 - core/res/res/values-zu/cm_strings.xml | 1 - core/res/res/values/cm_arrays.xml | 25 - core/res/res/values/cm_strings.xml | 13 - core/res/res/values/cm_symbols.xml | 15 - core/res/res/values/config.xml | 1 - packages/SystemUI/AndroidManifest_cm.xml | 3 + .../android/systemui/qs/tiles/LiveDisplayTile.java | 62 +- .../accessibility/DisplayAdjustmentUtils.java | 24 +- .../display/AutomaticBrightnessController.java | 9 +- .../server/display/DisplayManagerService.java | 2 - .../server/display/DisplayPowerController.java | 16 +- .../server/display/LiveDisplayController.java | 650 --------------------- 105 files changed, 32 insertions(+), 1535 deletions(-) delete mode 100644 services/core/java/com/android/server/display/LiveDisplayController.java diff --git a/core/res/res/values-af/cm_strings.xml b/core/res/res/values-af/cm_strings.xml index c6b23b9999..993e775 100644 --- a/core/res/res/values-af/cm_strings.xml +++ b/core/res/res/values-af/cm_strings.xml @@ -168,18 +168,6 @@ kry root toegang Om die skerm te ontspeld, raak en hou die Terug knoppie. - - Outomaties - Kleurtemperatuur van die skerm sal outomaties aanpas na sononder en sonop - Af - Skakel al die aanpassings af - Dag - Alleenlik gebruik dag instellings - Nag - Alleenlik gebruik nag instellings - Buitekant (helder son) - Alleenlik gebruik buite instellings - LewendigeVertoning kan jou oogspanning verminder en help jou slaap in die nag. Klik hier om dit uit te probeer! Geen gekoppelde toestel %1$s gekoppelde toestel diff --git a/core/res/res/values-am/cm_strings.xml b/core/res/res/values-am/cm_strings.xml index 6dfdc6b..2ce9b8b 100644 --- a/core/res/res/values-am/cm_strings.xml +++ b/core/res/res/values-am/cm_strings.xml @@ -56,7 +56,6 @@ - لإلغاء تثبيت هذه الشاشة، المس واستمر في ضغط زر الرجوع. - - تلقائي - ضبط درجة حرارة لون للشاشة تلقائياً بعد غروب الشمس وشروق الشمس - إيقاف - تعطيل جميع التعديلات - النهار - استخدام إعدادات النهار فقط - الليل - استخدام إعدادات الليل فقط - خارج المنزل ( شمس ساطعة) - استخدم إعدادات خارج المنزل فقط - ميزة LiveDisplay يمكن أن تساعد في تقليل إجهاد العين والمساعدة على النوم في الليل. انقر هنا لتجربته! لا يوجد جهاز متصل %1$s جهاز متصل diff --git a/core/res/res/values-as-rIN/cm_strings.xml b/core/res/res/values-as-rIN/cm_strings.xml index c0ebb2a..c410620 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 @@ ৰুট প্ৰৱেশাধিকাৰ প্ৰাপ্ত কৰা এই স্ক্ৰীণ আনপিন কৰিবলৈ, বেক বুটামটো স্পৰ্শ কৰক আৰু হেঁচি ৰাখক। - - স্বয়ংক্ৰিয় - সূৰ্যাস্ত আৰু সূৰ্যোদয়ৰ পাছত স্বয়ংক্ৰিয়ভাবে স্ক্ৰীণৰ ৰং তাপমাত্ৰা মিলাওক। - অফ - সকলো সমাযোজন অক্ষম কৰক - দিন - কেৱল দিনৰ ছেটিংচ ব্যৱহাৰ কৰক - নাইট - কেৱল ৰাতিৰ ছেটিংচ ব্যৱহাৰ কৰক - আউটডোৰ (উজ্জ্বল ৰ\'দ) - কেৱল আউটডোৰ ছেটিংচ ব্যৱহাৰ কৰক - লাইভপ্রদর্শন আপোনাৰ চকুৰ ওপৰত চাপ কমাব পাৰে আৰু ৰাতি শোৱাত সহায় কৰিব পাৰে। ইয়াক চেষ্টা কৰি চাবলৈ ইয়াত ক্লিক কৰক! কোনো সংযোগিত ডিভাইচ নাই %1$s সংযোগিত ডিভাইচ diff --git a/core/res/res/values-ast-rES/cm_strings.xml b/core/res/res/values-ast-rES/cm_strings.xml index 2809774..9c65ae0 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 @@ escribir un mensaxe SMS obtener accesu root - - Automáticu - Axustar automáticamente la temperatura del color de pantalla col alborecer y l\'atapecer - Desactiváu - Deshabilitar tolos axustes - Día - Usar namái los axustes de día - Nueche - Usar namái los axustes de nueche - Esterior (lluz del sol) - Usar namái axustes del esterior - LiveDisplay pue amenorgar reducir la fatiga visual y ayudar a dormir pela nueche. ¡Toca equí pa probalu! Nun hai dengún preséu coneutáu %1$s preséu coneutáu diff --git a/core/res/res/values-az-rAZ/cm_strings.xml b/core/res/res/values-az-rAZ/cm_strings.xml index 77dde70..519809f 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 @@ root müraciəti əldə et Bu ekranı çıxarmaq üçün Geri düyməsinə toxunub basılı tutun. - - Avtomatik - Gün çıxandan və batandan sonra ekranın rəng hərarətini avtomatik tənzimləyər - Bağlı - Bütün tənzimləmələri ləğv et - Gündüz - Yalnız gündüz tənziml. istifadə et - Gecə - Yalnız gecə tənziml. istifadə et - Açıq hava (parlaq günəş) - Yalnız açıq hava tənziml. istifadə et - 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! Bağlı cihaz yoxdur %1$s cihaz bağlıdır diff --git a/core/res/res/values-be/cm_strings.xml b/core/res/res/values-be/cm_strings.xml index a08f7be..8a524bc 100644 --- a/core/res/res/values-be/cm_strings.xml +++ b/core/res/res/values-be/cm_strings.xml @@ -167,18 +167,6 @@ атрымаць правы суперкарыстальніка Каб адмацаваць экран, націсніце і ўтрымвайце кнопку \"Назад\". - - Аўтаматычна - Аўтаматычная падладка колеравай тэмпературы экрана пасля заходу і ўзыходу сонца - Адключыць - Адключыць аўтападладку - Дзень - Толькі дзённыя налады - Ноч - Толькі начныя налады - На вуліцы (яскравае сонца) - Толькі вулічны рэжым - LiveDisplay дапаможа зменшыць глядзельную напругу і палепшыць сон. Націсніце тут, каб паспрабаваць! Няма падлучаных прылад %1$s падлучаная прылада diff --git a/core/res/res/values-bg/cm_strings.xml b/core/res/res/values-bg/cm_strings.xml index 0d3d83e..2614572 100644 --- a/core/res/res/values-bg/cm_strings.xml +++ b/core/res/res/values-bg/cm_strings.xml @@ -168,18 +168,6 @@ получете администраторски права За да освободите този екран, докоснете и задръжте бутона назад. - - Автоматичен - Настройва автоматично температурата на цветовете на екрана след залез и изгрев - Изключен - Деактивира всички корекции - Дневен - Само настройки на дневен режим - Нощен - Само настройки на нощен режим - На открито (ярко слънце) - Само настройки на режим на открито - Използването на адаптивен екран може да помогне за намаляване умората в очите през нощта. Докоснете тук, за да го изпробвате! Няма свързано устройство %1$s устройството е свързано diff --git a/core/res/res/values-bn-rBD/cm_strings.xml b/core/res/res/values-bn-rBD/cm_strings.xml index 94b1311..148a78d 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 @@ এমএমএস বার্তা লিখুন এসএমএস বার্তা লিখুন - - স্বয়ংক্রিয় - বন্ধ - সব সামঞ্জস্যগুলি অক্ষম করুন - শুধু দিবা রূপান্তর নির্ধারণ ব্যবহার করুন - কেবল রাতের রূপান্তর নির্ধারণ ব্যবহার করুন - বহিরঙ্গন (উজ্জ্বল সূর্যালোক) - শুধুমাত্র বহিরঙ্গন রূপান্তর নির্ধারণ ব্যবহার করুন - Per desancorar aquesta pantalla, toca i aguanta el botó Enrera. - - Automàtic - Ajusta automàticament la temperatura de color de la pantalla després de la posta de sol i de l\'alba - No - Deshabilita tots els ajustaments - Dia - Utilitza només la configuració de dia - Nit - Utilitza només la configuració de nit - Exterior (sol intens) - Utilitza només la configuració d\'exterior - LiveDisplay pot ajudar-te a reduir la fatiga ocular i ajudar-te a dormir a la nit. Fes clic aquí per provar-ho! Cap dispositiu connectat %1$s dispositiu connectat diff --git a/core/res/res/values-cs/cm_strings.xml b/core/res/res/values-cs/cm_strings.xml index 102069c..acfb108 100644 --- a/core/res/res/values-cs/cm_strings.xml +++ b/core/res/res/values-cs/cm_strings.xml @@ -168,18 +168,6 @@ získat root přístup Chcete-li odebrat tuto obrazovku, podržte tlačítko Zpět. - - Automaticky - Automaticky upravit teplotu barev obrazovky po západu a východu slunce - Vypnuto - Zakázat všechny úpravy - Den - Nastavení pouze pro den - Noc - Nastavení pouze pro noc - Venku (slunečno) - Nastavení pouze pro venkovní - LiveDisplay může pomoci proti namáhání očí a také spánku v noci. Dotykem zde tuto funkci můžete vyzkoušet! Žádné připojené zařízení %1$s připojené zařízení diff --git a/core/res/res/values-cy/cm_strings.xml b/core/res/res/values-cy/cm_strings.xml index 6dfdc6b..2ce9b8b 100644 --- a/core/res/res/values-cy/cm_strings.xml +++ b/core/res/res/values-cy/cm_strings.xml @@ -56,7 +56,6 @@ - For at frigøre denne skærm, tryk og hold Tilbage-knappen nede. - - Automatisk - Justerer automatisk farvetemperaturen på skærmen efter solnedgang og solopgang - Fra - Deaktivere alle justeringer - Dag - Brug kun dag-indstillinger - Nat - Brug kun nat-indstillinger - Udendørs (stærk sol) - Brug kun udendørsindstillinger - 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! Ingen tilsluttet enhed %1$s tilsluttet enhed diff --git a/core/res/res/values-de/cm_strings.xml b/core/res/res/values-de/cm_strings.xml index 835b7c9..5209a36 100644 --- a/core/res/res/values-de/cm_strings.xml +++ b/core/res/res/values-de/cm_strings.xml @@ -168,18 +168,6 @@ Root-Zugriff zu erhalten Zum Lösen dieser Ansicht drücken und halten Sie die Zurück-Taste. - - Automatisch - Farbtemperatur des Bildschirms nach Sonnenaufgang und Sonnenuntergang automatisch anpassen - Aus - Alle Anpassungen deaktivieren - Tag - Nur Tag-Modus verwenden - Nacht - Nur Nacht-Modus verwenden - Außen (helle Sonne) - Nur Außen-Modus verwenden - LiveDisplay kann gegen eine Überanstrengung der Augen und beim Schlafen in der Nacht helfen. Klicken Sie hier, um es auszuprobieren! Kein verbundenes Gerät %1$s verbundenes Gerät diff --git a/core/res/res/values-el/cm_strings.xml b/core/res/res/values-el/cm_strings.xml index c9bb050..a872602 100644 --- a/core/res/res/values-el/cm_strings.xml +++ b/core/res/res/values-el/cm_strings.xml @@ -168,18 +168,6 @@ πρόσβαση root Για να ξεκαρφιτσώσετε αυτήν την οθόνη, αγγίξτε και κρατήστε πατημένο το πλήκτρο Πίσω. - - Αυτόματη - Αυτόματη ρύθμιση της θερμοκρασίας χρώματος της οθόνης μετά το ηλιοβασίλεμα και την ανατολή του ηλίου - Απενεργοποιημένη - Απενεργοποίηση όλων των ρυθμίσεων - Ημέρα - Χρήση μόνο των ρυθμίσεων ημέρας - Νύχτα - Χρήση μόνο των ρυθμίσεων νύχτας - Εξωτερικός χώρος (ήλιος) - Χρήση μόνο των ρυθμίσεων εξωτερικού χώρου - Το LiveDisplay μπορεί να βοηθήσει στη μείωση της κόπωσης των ματιών και να σας βοηθήσει να κοιμηθείτε τη νύχτα. Κάντε κλικ εδώ για να το δοκιμάσετε! Καμία συνδεδεμένη συσκευή %1$s συνδεδεμένη συσκευή diff --git a/core/res/res/values-en-rAU/cm_strings.xml b/core/res/res/values-en-rAU/cm_strings.xml index 5d4d9d6..1ccf5e4 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 @@ write an SMS message get root access - - Automatic - Automatically adjust color temperature of screen after sunset and sunrise - Off - Disable all adjustments - Day - Use day settings only - Night - Use night settings only - Outdoor (bright sun) - Use outdoor settings only - LiveDisplay can help reduce eyestrain and help you sleep at night. Click here to try it out! No connected device %1$s connected device diff --git a/core/res/res/values-en-rGB/cm_strings.xml b/core/res/res/values-en-rGB/cm_strings.xml index 6dfdc6b..2ce9b8b 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 @@ - To unpin this screen, touch and hold the Back button. - - Automatic - Automatically adjust color temperature of screen after sunset and sunrise - Off - Disable all adjustments - Day - Use day settings only - Night - Use night settings only - Outdoor (bright sun) - Use outdoor settings only - LiveDisplay can help reduce eyestrain and help you sleep at night. Click here to try it out! No connected device %1$s connected device diff --git a/core/res/res/values-en-rPT/cm_strings.xml b/core/res/res/values-en-rPT/cm_strings.xml index 6dfdc6b..2ce9b8b 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 @@ - Por malŝlosi tiun ekranon, tuŝetu kaj tenu la Reen butonon. - - Aŭtomata - Aŭtomate alĝustigi kolortemperaturon de la ekrano post sunsubiro kaj suniĝo - For - Malŝalti ĉiujn ĝustigojn - Tago - Uzi nur tagajn agordojn - Nokto - Uzi nur noktajn agordojn - Ekstere (brila suno) - Uzi nur eksterajn parametrojn - LiveDisplay povas helpi vin malgrandigi okulo-streĉon nokte. Alklaku tie por provi! Neniu konektata aparato %1$s konektita aparato diff --git a/core/res/res/values-es-rMX/cm_strings.xml b/core/res/res/values-es-rMX/cm_strings.xml index 8c48bc1..f1ca093 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 @@ obtener cuentas del dispositivo cambiar el estado de Wi-Fi - Para desanclar esta pantalla, mantén pulsado el botón Atrás. - - Automático - Ajustar automáticamente la temperatura del color de pantalla con el amanecer y el anochecer - Desactivado - Deshabilitar todos los ajustes - Día - Utilizar solo los ajustes de día - Noche - Utilizar solo los ajustes de noche - Al aire libre (luz del sol) - Utilizar solo los ajustes de aire libre - LiveDisplay puede ayudar a reducir la fatiga visual y a dormir por la noche. ¡Haz clic aquí para probarlo! Ningún dispositivo conectado %1$s dispositivo conectado diff --git a/core/res/res/values-es/cm_strings.xml b/core/res/res/values-es/cm_strings.xml index dd4d627..e602fd4 100644 --- a/core/res/res/values-es/cm_strings.xml +++ b/core/res/res/values-es/cm_strings.xml @@ -168,18 +168,6 @@ obtener acceso administrativo Para liberar esta pantalla, mantén pulsado el botón Atrás. - - Automático - Ajustar automáticamente la temperatura del color de pantalla con el amanecer y el anochecer - Desactivado - Desactivar todos los ajustes - Día - Utilizar solo los ajustes de día - Noche - Utilizar solo los ajustes de noche - Al aire libre (luz del sol) - Utilizar solo los ajustes al aire libre - LiveDisplay puede reducir la fatiga visual y ayudar a dormir por la noche. ¡Toca aquí para probarlo! Ningún dispositivo conectado %1$s dispositivo conectado diff --git a/core/res/res/values-et-rEE/cm_strings.xml b/core/res/res/values-et-rEE/cm_strings.xml index cd3a2c1..99ceaa9 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 @@ saada root ligipääsu Selle ekraani vabastamiseks puudutage ja hoidke all Tagasi nuppu. - - Automaatne - Automaatselt reguleeri ekraani värvitemperaturri pärast päikeseloojangut ja -tõusu - Väljas - Keela kõik kohandused - Päev - Kasuta ainult päeva seadeid - Öö - Kasuta ainult öö seadeid - Õues (ere päike) - Kasuta ainult õue seadeid - LiveDisplay võimaldab vähendada silmade pinget ja lasta sul öösel magada. Kliki siin et seda proovida! Pole ühtegi ühendatud seadet %1$s ühendatud seade diff --git a/core/res/res/values-eu-rES/cm_strings.xml b/core/res/res/values-eu-rES/cm_strings.xml index d12e071..52d8b20 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 @@ root sarbidea eskuratu Pantaila hau desiltzatzeko sakatu eta mantendu atzera botoia. - - Automatikoa - Doitu automatikoki pantailaren kolore tenperatura ilunabarra eta egunsentiaren ostean - Ez - Ezgaitu doitze guztiak - Eguna - Erabili egun ezarpenak besterik ez - Gaua - Erabili gau ezarpenak besterik ez - Kalean (eguzkipean) - Erabili kaleko ezarpenak besterik ez - LiveDisplayk begi nekea gutxitu eta gauez lo egiten lagundu dezake. Probatu ezazu! Ez da gailurik konektatu gailu %1$s konektatuta diff --git a/core/res/res/values-fa/cm_strings.xml b/core/res/res/values-fa/cm_strings.xml index 9c95537..e8278c2 100644 --- a/core/res/res/values-fa/cm_strings.xml +++ b/core/res/res/values-fa/cm_strings.xml @@ -151,18 +151,6 @@ دریافت دسترسی روت برای از سنجاق درآوردن این صفحه، دکمه بازگشت را زده و نگه دارید. - - خودکار - تنظیم خودکار دمای رنگ صفحه بعد از طلوع و غروب خورشید - خاموش - غیرفعال کردن همه تنظیمات - روز - فقط استفاده از تنظیمات روز - شب - فقط استفاده از تنظیمات شب - فضای باز (نور خورشید) - فقط استفاده از تنظیمات فضای باز - نمایش پویا کمک می‌کند چشم‌هایتان کم‌تر خسته شده و شب راحت‌تر به خواب بروید. برای امتحان آن اینجا کلیک کنید! هیچ دستگاه متصلی وجود ندارد %1$s دستگاه متصل diff --git a/core/res/res/values-fi/cm_strings.xml b/core/res/res/values-fi/cm_strings.xml index db6e4d6..db3b930 100644 --- a/core/res/res/values-fi/cm_strings.xml +++ b/core/res/res/values-fi/cm_strings.xml @@ -168,18 +168,6 @@ pääkäyttäjän oikeudet Irrottaaksesi tämän näytön, paina ja pidä Takasin-näppäintä pohjassa. - - Automaattinen - Säädä näytön värilämpötilaa automaattisesti auringonlaskun ja -nousun jälkeen - Pois käytöstä - Poista kaikki mukautukset - Päivä - Käytä vain päiväasetusta - Yö - Käytä vain yöasetusta - Ulkoilma (kirkas aurinko) - Käytä vain ulkoilma-asetusta - LiveDisplay voi vähentää silmien rasitusta ja auttaa nukkumaan öisin. Kokeile sitä painamalla tästä! Ei kytkettyä laitetta %1$s yhdistetty laite diff --git a/core/res/res/values-fil-rPH/cm_strings.xml b/core/res/res/values-fil-rPH/cm_strings.xml index 6dfdc6b..2ce9b8b 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 @@ - - Pour déverrouiller l\'écran, appuyez et maintenez le bouton Retour. - - Automatique - Ajuster automatiquement la température des couleurs de l\'écran après le coucher et le lever du soleil - Désactivé - Désactiver tous les réglages - Jour - Utiliser uniquement les paramètres de jour - Nuit - Utiliser uniquement les paramètres de nuit - Extérieur (plein soleil) - Utiliser uniquement les paramètres extérieurs - LiveDisplay peut aider à réduire la fatigue oculaire et vous aider à dormir la nuit. Appuyez ici pour l\'essayer ! Aucun appareil connecté %1$s appareil connecté diff --git a/core/res/res/values-frp-rIT/cm_strings.xml b/core/res/res/values-frp-rIT/cm_strings.xml index 6dfdc6b..2ce9b8b 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 @@ - - - Para deixar de fixar esta pantalla, mantén tocado o botón Atrás. - - Automático - Axustar automaticamente os tons da pantalla ao amencer e o solpor - Apagado - Desactivar todos os axustes - Día - Utilizar tan só os axustes de día - Noite - Utilizar tan só os axustes de noite - Exteriores (iluminado) - Utilizar tan só os axustes de exteriores - O modo LiveDisplay pode axudar coa dor de ollos e a conciliar o sono. Toca aquí para probalo! Dispositivo non conectado Dispositivo %1$s conectado diff --git a/core/res/res/values-gu-rIN/cm_strings.xml b/core/res/res/values-gu-rIN/cm_strings.xml index e763eab..62072a0 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 @@ રૂટ ઍક્સેસ મેળવી આ સ્ક્રીન અનપિન કરવા માટે બૅક બટન પર ટચ કરી પકડી રાખો. - - સ્વચલિત - સૂર્યોદય અને સૂર્યાસ્ત પછી સ્ક્રીનના રંગ તાપમાનને સ્વયંચાલિત રીતે સમાયોજિત કરો - બંધ - તમામ ફેરફારો અક્ષમ કરો - દિવસ - ફકત ડે સેટિંગ્સનો ઉપયોગ કરો - રાત્રિ - ફકત નાઇટ સેટિંગ્સનો ઉપયોગ કરો - આઉટડોર (તેજ તડકો) - ફકત આઉટડોર સેટિંગ્સનો ઉપયોગ કરો - લાઇવડિસ્પ્લેથી આંખો પરની તાણ ઘટાડી શકાય છે અને તમને રાતે સૂવામાં મદદરૂપ થઈ શકે. અજમાવવા અહીં ક્લિક કરો! કોઇ ડિવાઇસ કનેક્ટ થયેલ નથી %1$s ડિવાઇસ કનેક્ટ થયેલ છે diff --git a/core/res/res/values-hi/cm_strings.xml b/core/res/res/values-hi/cm_strings.xml index 5efa3bf..65e20c4 100644 --- a/core/res/res/values-hi/cm_strings.xml +++ b/core/res/res/values-hi/cm_strings.xml @@ -149,18 +149,6 @@ मूल तक पहुँच प्राप्त करें इस स्क्रीन को अनपिन करने के लिए पीछे के बटन को कुछ देर के लिए छुएँ। - - स्वचालित - सूर्यास्त और सूर्योदय के बाद अपने आप ही स्क्रीन के रंग तापमान को समायोजित करें - बंद - सभी समायोजनों को अक्षम करें - दिन - केवल दिन की सेटिंग का उपयोग करें - रात - केवल रात की सेटिंग का उपयोग करें - बाहर (तेज़ धूप) - केवल बाहर की सेटिंग का उपयोग करें - लाइवडिस्प्ले आँखों पर पड़नेवाले दबाव को घटा सकता है और आपको रात को अच्छी तरह से सोने में मदद कर सकता है। इसे आज़माने के लिए यहाँ क्लिक करें। कोई जुड़ा हुआ उपकरण नहीं है %1$s जुड़ा हुआ उपकरण diff --git a/core/res/res/values-hr/cm_strings.xml b/core/res/res/values-hr/cm_strings.xml index f71bc0e..75abf47 100644 --- a/core/res/res/values-hr/cm_strings.xml +++ b/core/res/res/values-hr/cm_strings.xml @@ -168,18 +168,6 @@ Zatraži root pristup Za otkvačiti ovaj zaslon dodirnite i držite tipku za natrag - - Automatski - Automatski prilagodi temperaturu boje zaslona nakon zalaska i izlaska sunca - Isključeno - Onemogući sva prilagođavanja - Dan - Koristi samo postavke za dan - Noć - Koristi samo postavke za noć - Vani (jako sunce) - Koristi samo postavke za van - LiveDisplay može smanjiti naprezanje očiju i poboljšati san. Dodirnite ovdje ako ga želite isprobati! Nema spojenih uređaja %1$s povezani uređaj diff --git a/core/res/res/values-hu/cm_strings.xml b/core/res/res/values-hu/cm_strings.xml index e04646e..212a0c4 100644 --- a/core/res/res/values-hu/cm_strings.xml +++ b/core/res/res/values-hu/cm_strings.xml @@ -168,18 +168,6 @@ rendszergazdai jogosultság szerzése Képernyő rögzítésének feloldásához érintse meg és tartsa nyomva a Vissza gombot. - - Automatikus - Automatikusan beállítja a képernyő színhőmérsékletét napnyugta és napkelte után - Ki - Az összes beállítás kikapcsolása - Nappal - Csak a nappali beállítások használata - Éjszaka - Csak az éjszakai béállítások használata - Kültéri (erős napfény) - Csak a kültéri beállítások használata - 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! Nincs csatlakoztatott készülék %1$s csatlakoztatott eszköz diff --git a/core/res/res/values-hy-rAM/cm_strings.xml b/core/res/res/values-hy-rAM/cm_strings.xml index 6dfdc6b..2ce9b8b 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 @@ - - - Per sbloccare questo schermo, tocca e tieni premuto il pulsante indietro. - - Automatico - Regola automaticamente la temperatura del colore dello schermo dopo il tramonto e l\'alba - Disattivato - Disattiva tutte le regolazioni - Giorno - Usa solo impostazioni giorno - Notte - Utilizza solo impostazioni notte - All\'aperto (sole) - Utilizza solo impostazioni all\'aperto - LiveDisplay aiuta a ridurre l\'affaticamento degli occhi e aiuta a dormire di notte. Clicca per provarlo! Nessun dispositivo connesso %1$s dispositivo connesso diff --git a/core/res/res/values-iw/cm_strings.xml b/core/res/res/values-iw/cm_strings.xml index d7b6382..291bacc 100644 --- a/core/res/res/values-iw/cm_strings.xml +++ b/core/res/res/values-iw/cm_strings.xml @@ -168,18 +168,6 @@ קבלת גישת שורש (Root) כדי לבטל נעיצת מסך זה, גע והחזק בלחצן \"הקודם\". - - אוטומטי - התאם אוטומטית את טמפרטורת הצבע של המסך לאחר הזריחה והשקיעה - כבוי - השבת את כל ההתאמות - יום - השתמש בהגדרות יום בלבד - לילה - השתמש בהגדרות לילה בלבד - בחוץ (שמש בהירה) - השתמש בהגדרות חוץ בלבד - LiveDisplay יכולה למזער את עייפות העין ולעזור לך לישון בלילה. לחץ כאן כדי לנסות! אין מכשירים מחוברים מכשיר %1$s מחובר diff --git a/core/res/res/values-ja/cm_strings.xml b/core/res/res/values-ja/cm_strings.xml index c307caf..511f521 100644 --- a/core/res/res/values-ja/cm_strings.xml +++ b/core/res/res/values-ja/cm_strings.xml @@ -168,18 +168,6 @@ ルートアクセスの取得 この画面の固定を解除するには、戻るボタンを長押しします。 - - 自動 - 太陽の動きに合わせて画面の色温度を自動的に調整する - OFF - すべての調整を無効にする - 昼 - 昼の設定のみを使用する - 夜 - 夜の設定のみを使用する - 屋外（日光） - 屋外の設定のみを使用する - LiveDisplayは目を疲れにくくし、夜の睡眠を邪魔しません。ここをタップして試してみてください。 接続しているデバイスはありません %1$s台のデバイスが接続しています diff --git a/core/res/res/values-ka-rGE/cm_strings.xml b/core/res/res/values-ka-rGE/cm_strings.xml index 6dfdc6b..2ce9b8b 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 @@ - - - ಪರದೆಯನ್ನು ಅನ್‍ಪಿನ್‍ಮಾಡಲು, ಹಿಂದೆ ಬಟನ್‍ ಸ್ಪರ್ಶಿಸಿ ಹಿಡಿಯಿರಿ. - - ಸ್ವಯಂಚಾಲಿತ - ಸೂರ್ಯಾಸ್ತ ಅಥವ ಸೂರ್ಯೋದಯದ ನಂತರ ಪರದೆಯ ಬಣ್ಣ ಉಷ್ಣಾಂಶವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸರಿಹೊಂದಿಸು - ಆಫ್ - ಎಲ್ಲಾ ಹೊಂದಾಣಿಕೆಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು - ದಿನ - ದಿನ ಸೆಟ್ಟಿಂಗ್ಸನ್ನು ಮಾತ್ರ ಉಪಯೋಗಿಸು - ರಾತ್ರಿ - ರಾತ್ರಿ ಸೆಟ್ಟಿಂಗ್ಸನ್ನು ಮಾತ್ರ ಉಪಯೋಗಿಸು - ಹೊರಾಂಗಣ (ಪ್ರಕಾಶಮಾನ ಸೂರ್ಯ) - ಹೊರಾಂಗಣ ಸೆಟ್ಟಿಂಗ್ಸನ್ನು ಮಾತ್ರ ಉಪಯೋಗಿಸು - ಲೈವ್ ಡಿಸ್ಪ್ಲೆ ನಿಮ್ಮ ಕಣ್ಣಿನ ಆಯಾಸವನ್ನು ಕಡಿಮೆಮಾಡಿ ರಾತ್ರಿ ಮಲಗಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ. ಇದನ್ನು ಪ್ರಯತ್ನಿಸಲು ಇಲ್ಲಿ ಒತ್ತಿ! ಯಾವುದೇ ಸಂಪರ್ಕಗೊಂಡ ಸಾಧನವಿಲ್ಲ %1$s ಸಂಪರ್ಕಗೊಳಿಸಿದ ಸಾಧನ diff --git a/core/res/res/values-ko/cm_strings.xml b/core/res/res/values-ko/cm_strings.xml index 6762af1..697df4b 100644 --- a/core/res/res/values-ko/cm_strings.xml +++ b/core/res/res/values-ko/cm_strings.xml @@ -168,18 +168,6 @@ 루트 권한 얻기 화면 고정을 해제하려면 뒤로 버튼을 계속 누르세요 - - 자동 - 일출 및 일몰 후 화면의 색 온도를 자동으로 조정 - 끄기 - 모든 조정 사용 안 함 - 주간 - 주간 설정만으로 사용 - 야간 - 야간 설정만으로 사용 - 야외 (밝은 햇빛) - 야외 설정만으로 사용 - LiveDisplay는 눈의 피로를 줄이고 밤에 수면을 돕습니다. 적용하려면 클릭하십시오! 연결된 기기 없음 %1$s대의 기기가 연결되어 있습니다 diff --git a/core/res/res/values-ku/cm_strings.xml b/core/res/res/values-ku/cm_strings.xml index 12d8ec1..eb98dc2 100644 --- a/core/res/res/values-ku/cm_strings.xml +++ b/core/res/res/values-ku/cm_strings.xml @@ -141,15 +141,6 @@ نوسینی نامەی SMS بەدەستهێنانی ڕێگەپێدانی ڕۆت - - خۆکارانه‌ - کوژانه‌وه‌ - لەکارخستنی هەموو ڕێکخستنەکان - ڕۆژ - بەکارهێنانی ڕێکخستنی ڕۆژ تەنها - شەو - تەنها ڕێکخستنی شەو بەکاربهێنە - دەرەوە (ڕۆشنای خۆر) ئامێر پەیوەست نەکراوە %1$s ئامێر پەیوەستکراوە diff --git a/core/res/res/values-ky-rKG/cm_strings.xml b/core/res/res/values-ky-rKG/cm_strings.xml index 6dfdc6b..2ce9b8b 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 @@ - Fir dëse Schierm lasszeléisen, dréck den Zréck-Knäppchen an hal e gedréckt. - - Automatesch - Faarftemperatur automatesch dem Sonnenënnergank a Sonnenopgank upassen - Aus - All Upassungen desaktivéieren - Dag - Just Dagesmodus benotzen - Nuecht - Just Nuetsmodus benotzen - Baussen (hell Sonn) - Just Baussemodus benotzen - LiveDisplay ka géint Iwwerustrengung vun den Aen a beim Schlofen an der Nuecht hëllefen. Dréck hei, fir et auszeprobéieren! Kee connectéierten Apparat %1$s connectéierten Apparat diff --git a/core/res/res/values-lo-rLA/cm_strings.xml b/core/res/res/values-lo-rLA/cm_strings.xml index 6dfdc6b..2ce9b8b 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 @@ - Kad atsegtumėte šį ekraną palieskite ir laikykite mygtuką atgal. - - Automatinis - Automatiškai sureguliuoti ekrano spalvos temperatūrą po saulėlydžio ir saulėtekio - Išjungta - Neleisti visų reguliavimų - Diena - Naudoti tik dienos nustatymus - Naktis - Naudoti tik nakties nustatymus - Laukas (ryški saulė) - Naudoti tik lauko nustatymus - „LiveDisplay“ gali padėti sumažinti akių įtampą ir padėti jums užmigti naktį. Spauskite čia, kad jį išbandyti! Nėra prijungto įrenginio %1$s prijungtas įrenginys diff --git a/core/res/res/values-lv/cm_strings.xml b/core/res/res/values-lv/cm_strings.xml index e4fbd7c..feda39b 100644 --- a/core/res/res/values-lv/cm_strings.xml +++ b/core/res/res/values-lv/cm_strings.xml @@ -138,7 +138,6 @@ rakstīt īsziņu saņemt root piekļuvi - Nav pievienota ierīce %1$s pievienota ierīce diff --git a/core/res/res/values-mk-rMK/cm_strings.xml b/core/res/res/values-mk-rMK/cm_strings.xml index 6dfdc6b..2ce9b8b 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 @@ - ഈ സ്ക്രീൻ വേര്‍തിരിക്കുക ചെയ്യുന്നതിന്, പിന്നിലേക്ക് ബട്ടൺ അമര്‍ത്തിപ്പിടിക്കുക. - - യാന്ത്രികമായി - സൂര്യാസ്തമയത്തിനും സൂര്യോദയത്തിനും ശേഷം സ്ക്രീനിന്റെ കളര്‍ താപനില സ്വയം ക്രമീകരിക്കുക - ഓഫാണ് - എല്ലാ ക്രമീകരണങ്ങളും അപ്രാപ്തമാക്കുക - ദിവസം - പകല്‍ ക്രമീകരണങ്ങൾ മാത്രം ഉപയോഗിക്കുക - രാത്രി - രാത്രി ക്രമീകരണങ്ങൾ മാത്രം ഉപയോഗിക്കുക - ഔട്ട്ഡോർ (തെളിഞ്ഞ സൂര്യൻ) - ഔട്ട്ഡോർ ക്രമീകരണങ്ങൾ മാത്രം ഉപയോഗിക്കുക - ലൈവ്ഡിസ്പ്ലേ നിങ്ങളുടെ കണ്ണിന്റെ സമ്മര്‍ദ്ദം കുറയ്ക്കുകയും രാത്രി ഉറങ്ങാൻ നിങ്ങളെ സഹായിക്കുകയും ചെയ്യുന്നു. ഇത് പരീക്ഷിക്കാൻ ഇവിടെ ക്ലിക്ക് ചെയ്യുക! ബന്ധിപ്പിച്ച ഉപകരണം ഇല്ല %1$s ബന്ധിപ്പിച്ച ഉപകരണം diff --git a/core/res/res/values-mn-rMN/cm_strings.xml b/core/res/res/values-mn-rMN/cm_strings.xml index 6dfdc6b..2ce9b8b 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 @@ - हा स्क्रीन अनपिन करण्यासाठी, मागे बटण दाबून धरा. - - स्वयंचलित - सूर्यास्त व सूर्योदयानंतर स्क्रीनचे रंग तापमान स्वयंचलितपणे समायोजित करा - बंद - सर्व समायोजने अक्षम करा - दिवस - केवळ दिवस सेटिंग्ज वापरा - रात्र - केवळ रात्र सेटिंग्ज वापरा - आऊटडोअर (चमकदार सूर्य) - केवळ आऊटडोअर सेटिंग्ज वापरा - थेटप्रदर्शन डोळ्यांचा ताण कमी करण्यास मदत करते आणि तुम्हाला रात्री झोपण्यास मदत करते. ते वापरून पाहण्यासाठी इथे क्लिक करा! कनेक्टेड डिव्हाइस नाही %1$s कनेक्टेड डिव्हाइस diff --git a/core/res/res/values-ms-rMY/cm_strings.xml b/core/res/res/values-ms-rMY/cm_strings.xml index 6dfdc6b..2ce9b8b 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 @@ - - For å unpin denne skjermen, trykk og hold tilbake-knappen. - - Automatisk - Juster fargetemperatur på skjermen etter solnedgang og soloppgang - Av - Deaktivere alle justeringer - Dag - Bruk kun dag innstillinger - Natt - Bruk kun natt instillinger - Utendørs (sterkt sollys) - Bruk kun utendørs innstillinger - LiveDisplay kan hjelpe deg med å redusere belastningen på øynene og hjelpe deg med å sove om natten. Trykk her for å prøve det ut! Ingen tilkoblede enheter %1$s tilkoblet enhet diff --git a/core/res/res/values-ne-rNP/cm_strings.xml b/core/res/res/values-ne-rNP/cm_strings.xml index 6dfdc6b..2ce9b8b 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 @@ - Blijf de Terug-knop aanraken om dit scherm los te maken. - - Automatisch - Automatisch kleurtemperatuur van scherm aanpassen na zonsopkomst en -ondergang - Uit - Alle aanpassingen uitschakelen - Overdag - Alleen instellingen voor overdag gebruiken - \'s Nachts - Alleen instellingen voor \'s nachts gebruiken - Buitenshuis (felle zon) - Alleen instellingen voor buitenshuis gebruiken - LiveDisplay kan oogvermoeidheid verminderen en helpt u om \'s nachts te slapen. Tik hier om het uit te proberen Geen aangesloten apparaat %1$s aangesloten apparaat diff --git a/core/res/res/values-oc-rFR/cm_strings.xml b/core/res/res/values-oc-rFR/cm_strings.xml index 6dfdc6b..2ce9b8b 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 @@ - ଏହି ସ୍କ୍ରିନ୍‍ ଅନ୍‍ପିନ୍‍ କରିବା ପାଇଁ, ବ୍ୟାକ୍‍ ବଟନ୍‍ ସ୍ପର୍ଶ କରନ୍ତୁ ଓ ଧରିରଖନ୍ତୁ। - - ସ୍ୱତଃସ୍ପୃତ - ସୂର୍ଯ୍ୟାସ୍ତ ଓ ସୂର୍ଯ୍ୟୋଦୟ ପରେ ରଙ୍ଗ ତାପମାତ୍ରା ସ୍ୱତଃ ଆଡ୍‍ଜଷ୍ଟ କରନ୍ତୁ - ଅଫ୍ - ସ୍ସମସ୍ତ ଆଡ୍‍ଜଷ୍ଟ୍ମେଣ୍ଟ ଅଷମ କରନ୍ତୁ - ଦିନ - କେବଳ ଦିନ ସେଟିଂସ୍‍ ବ୍ୟବହାର କରନ୍ତୁ - ରାତ୍ରି - କେବଳ ରାତ୍ରି ସେଟିଂସ୍‍ ବ୍ୟବହାର କରନ୍ତୁ - ଆଉଟ୍‍ଡୋର୍‍ (ଟାଣ ଖରା) - କେବଳ ଆଉଟ୍‍ଡୋର୍‍ ସେଟିଂସ୍‍ ବ୍ୟବହାର କରନ୍ତୁ - ଲାଇଭ୍‍ଡିସ୍‍ପ୍ଲେ ଆଇଷ୍ଟ୍ରେନ୍‍ କମାଇବାରେ ଓ ରାତିରେ ଆପଣଙ୍କୁ ଶୋଇବାରେ ସାହାଯ୍ୟ କରିପାରେ। ଏହା ବ୍ୟବହାର କରିବା ପାଇଁ ଏଠାରେ କ୍ଲିକ୍‍ କରନ୍ତୁ! ସଂଯୋଗ ହୋଇଥିବା କିଛି ଡିଭାଇସ୍‍ ନା୍ହିଁ %1$s ସଂଯୋଗ ହୋଇଥିବା ଡିଭାଇସ୍ diff --git a/core/res/res/values-pa-rIN/cm_strings.xml b/core/res/res/values-pa-rIN/cm_strings.xml index 6dfdc6b..2ce9b8b 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 @@ - Aby odpiąć ekran, dotknij i przytrzymaj przycisk Wstecz. - - Automatycznie - Automatycznie dostosuj temperaturę kolorów ekranu po zachodzie i wschodzie słońca - Wyłączony - Wyłącz wszystkie zmiany - Dzień - Używaj tylko ustawień na dzień - Noc - Używaj ustawień tylko w nocy - Na zewnątrz (jasne światło) - Używaj ustawienia tylko na zewnątrz - LiveDisplay może pomóc w zredukowaniu efektu zmęczenia oczu oraz pomaga zasnąć w nocy. Kliknij tutaj, aby wypróbować! Brak podłączonego urządzenia %1$s podłączone urządzenie diff --git a/core/res/res/values-pt-rBR/cm_strings.xml b/core/res/res/values-pt-rBR/cm_strings.xml index 0541ea8..22be9bd 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 @@ obter acesso super usuário Para desafixar esta tela, toque e segure o botão Voltar. - - Automático - Ajusta automaticamente a temperatura de cor da tela após o pôr do sol e nascer do sol - Desligado - Desativar todos os ajustes - Dia - Usar apenas configurações diurnas - Noite - Use apenas configurações noturnas - Ao ar livre (sol forte) - Usar apenas configurações ao ar livre - LiveDisplay pode ajudar a reduzir o cansaço visual e ajudá-lo a dormir à noite. Clique aqui para experimentar! Nenhum dispositivo conectado %1$s dispositivo conectado diff --git a/core/res/res/values-pt-rPT/cm_strings.xml b/core/res/res/values-pt-rPT/cm_strings.xml index df0f4c3..bc1fd5f 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 @@ obter acesso root Para soltar este ecrã, toque e segure o botão Voltar. - - Automático - Ajusta automaticamente a temperatura de cor do ecrã após o pôr do sol e o nascer do sol - Desligado - Desativar todos os ajustes - Dia - Usar apenas as definições de dia - Noite - Usar apenas as definições de noite - Exterior (sol brilhante) - Usar apenas as definições de exterior - LiveDisplay pode ajudar a reduzir a fadiga ocular e ajudar-te a dormir à noite. Clique aqui para experimentar! Nenhum dispositivo conectado %1$s dispositivo conectado diff --git a/core/res/res/values-rm/cm_strings.xml b/core/res/res/values-rm/cm_strings.xml index 6dfdc6b..2ce9b8b 100644 --- a/core/res/res/values-rm/cm_strings.xml +++ b/core/res/res/values-rm/cm_strings.xml @@ -56,7 +56,6 @@ - Pentru a anula fixarea acestui ecran, atingeți și țineți apăsat butonul Înapoi. - - Automat - Reglează automat temperatura de culoare de pe ecran după apus și răsărit - Oprit - Dezactivează toate ajustările - Zi - Utilizați numai setările de zi - Noapte - Utilizați numai setările de noapte - În aer liber (soare strălucitor) - Utilizați numai setările în aer liber - LiveDisplay poate reduce oboseala ochilor și vă poate ajuta să dormiți noaptea. Apăsați aici pentru a-l încerca! Niciun dispozitiv conectat %1$s dispozitiv conectat diff --git a/core/res/res/values-ru/cm_strings.xml b/core/res/res/values-ru/cm_strings.xml index 6703a25..38f6a59 100644 --- a/core/res/res/values-ru/cm_strings.xml +++ b/core/res/res/values-ru/cm_strings.xml @@ -168,18 +168,6 @@ получить права суперпользователя Чтобы открепить экран, нажмите и удерживайте кнопку «Назад». - - Автоматически - Автоматическая подстройка цветовой температуры экрана после заката и восхода солнца - Отключить - Отключить автоподстройку - День - Только дневные настройки - Ночь - Только ночные настройки - На улице (яркое солнце) - Только уличный режим - LiveDisplay поможет снизить зрительное напряжение и улучшить сон. Нажмите здесь, чтобы попробовать! Нет подключенных устройств %1$s подключенное устройство diff --git a/core/res/res/values-si-rLK/cm_strings.xml b/core/res/res/values-si-rLK/cm_strings.xml index 7b5c9d0..0ceea5e 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 @@ MMS පණිවිඩයක් ලිවීම කෙටි පණිවිඩයක් ලිවීම - Na odopnutie tejto obrazovky stlačte a podržte tlačidlo Späť. - - Automatické - Automaticky upraviť teplotu farieb obrazovky po západe a východe slnka - Vypnuté - Zakázať všetky úpravy - Deň - Použiť len nastavenia pre deň - Noc - Použiť len nastavenia pre noc - Vonku (jasné slnko) - Používať len nastavenia pre vonkajšie prostredie - 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! Žiadne pripojené zariadenie %1$s pripojené zariadenie diff --git a/core/res/res/values-sl/cm_strings.xml b/core/res/res/values-sl/cm_strings.xml index c4df278..0648486 100644 --- a/core/res/res/values-sl/cm_strings.xml +++ b/core/res/res/values-sl/cm_strings.xml @@ -168,18 +168,6 @@ pridobitev skrbniškega dostopa Da odpnete ta zaslon, se dotaknite in pridržite gumb Nazaj. - - Samodejno - Samodejno nastavi barvno temperaturo zaslona po sončnem zahodu in vzhodu - Izklopljen - Onemogoči vse prilagoditve - Dan - Uporabi samo dnevne nastavitve - Noč - Uporabi samo nočne nastavitve - Na prostem (močna svetloba) - Uporabi samo nastavitve na prostem - LiveDisplay vam lahko pomaga pri zmanjšanju obremenitve oči in spanju ponoči. Kliknite tukaj, da ga preskusite! Nobene naprave ni povezane %1$s povezana naprava diff --git a/core/res/res/values-sq-rAL/cm_strings.xml b/core/res/res/values-sq-rAL/cm_strings.xml index 6dfdc6b..2ce9b8b 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 @@ - Да искључиш овај екран додирни и држи дугме за назад. - - Аутоматски - Аутоматски прилагоди температуру боје екрана после сумрака и свитања - Искључено - Онемогућити сва подешавања - Дан - Користи само дневна подешавања - Ноћ - Користи само ноћна подешавања - Напољу (јако сунце) - Користи само подешавања за напоље - LiveDisplay може смањити напрезање очију и помоћи да спавате ноћу. Додирните да пробате! Нема повезаног уређаја %1$s конектован уређај diff --git a/core/res/res/values-sv/cm_strings.xml b/core/res/res/values-sv/cm_strings.xml index 4bfe665..c5c91b0 100644 --- a/core/res/res/values-sv/cm_strings.xml +++ b/core/res/res/values-sv/cm_strings.xml @@ -168,18 +168,6 @@ få root-åtkomst För att frigöra denna skärm, tryck och håll nere Bakåt-knappen. - - Automatisk - Justera automatiskt skärmens färgtemperatur efter solnedgång och soluppgång - Av - Inaktivera alla justeringar - Dag - Använd enbart dagläge - Natt - Använd enbart nattläge - Utomhus (stark sol) - Använd endast utomhusläge - LiveDisplay kan minska överansträngning av ögon och hjälpa dig med nattsömnen. Klicka här för att prova! Ingen ansluten enhet %1$s ansluten enhet diff --git a/core/res/res/values-sw/cm_strings.xml b/core/res/res/values-sw/cm_strings.xml index 6dfdc6b..2ce9b8b 100644 --- a/core/res/res/values-sw/cm_strings.xml +++ b/core/res/res/values-sw/cm_strings.xml @@ -56,7 +56,6 @@ - இந்த திரையை அன்பின் செய்ய, பின்செல் பொத்தானைத் தொட்டு பிடித்துக்கொள். - - தானியங்கு - சூரிய மறைவு மற்றும் சூரிய உதயத்திற்கு பிறகு தானாகவே திரையின் வண்ன தட்பவெப்பங்களை சரிசெய் - முடக்கத்தில் - அனைத்து சரிசெய்தல்களையும் முடக்கு - பகல் - பகல் அமைப்புகளை மட்டும் பயன்படுத்துக - இரவு - இரவு அமைப்புகளை மட்டும் பயன்படுத்து - வெளியிடம் (பிரகாசமான சூரியன்) - வெளிப்புற அமைப்புகளை மட்டுமே பயன்படுத்து. - LiveDisplay கண்ணழுத்தத்தை குறைத்து, நீங்கள் இரவிலே உறங்க உதவுகிறது. அதை முயற்சிக்க இங்கே கிளிக் செய்க! இணைக்கப்பட்ட சாதனம் இல்லை %1$s இணைக்கப்பட்ட சாதனம் diff --git a/core/res/res/values-te-rIN/cm_strings.xml b/core/res/res/values-te-rIN/cm_strings.xml index 1ffcfa2..6200a30 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 @@ మూలాంశ ప్రాప్యతను పొందుము ఈ స్క్రీనును అన్పిన్ చేయడానికి, బ్యాక్ బటనును తాకండి మరియు పట్టుకోండి. - - స్వయంచాలకం - సూర్యాస్తమయం మరియు సూర్యోదయం తరువాత స్వయంచాలకంగా స్క్రీన్ యొక్క వర్ణ ఉష్ణోగ్రతను సవరించుము. - ఆఫ్‌ - అన్ని సవరణలను నిలిపివేయుము - పగలు - పగటి సెట్టింగులను మాత్రమే ఉపయోగించుము - రాత్రి - రాత్రి సెట్టింగులను మాత్రమే ఉపయోగించుము - ఆరుబయట (ప్రకాశవంతమైన సూర్యుడు) - ఆరుబయటి సెట్టింగులను మాత్రమే ఉపయోగించుము - ప్రత్యక్ష ప్రదర్శన మీ కంటిపై ఒత్తిడిని తగ్గించడానికి సహాయపడుతుంది మరియు రాత్రి సమయంలో నిద్రపోవడానికి సహకరిస్తుంది. దానిని ప్రయత్నించి చూడడానికి ఇక్కడ క్లిక్ చేయండి! ఎటువంటి పరికరం అనుసంధానించబడలేదు %1$s అనుసంధానించబడిన పరికరం diff --git a/core/res/res/values-th/cm_strings.xml b/core/res/res/values-th/cm_strings.xml index 9f6f5fc..cd6f80e 100644 --- a/core/res/res/values-th/cm_strings.xml +++ b/core/res/res/values-th/cm_strings.xml @@ -168,18 +168,6 @@ รับสิทธิผู้ดูแลระบบ เพื่อยกเลิกการปักหมุดหน้าจอนี้ กดปุ่มกลับค้างไว้ - - อัตโนมัติ - ตั้งอุณหภูมิสีจออัตโนมัติหลังดวงอาทิตย์ขึ้นและตก - ปิด - ปิดการปรับแต่งทั้งหมด - กลางวัน - ใช้การตั้งค่ากลางวันเท่านั้น - กลางคืน - ใช้การตั้งค่ากลางคืนเท่านั้น - กลางแจ้ง (แดดจ้า) - ใช้การตั้งค่ากลางแจ้งเท่านั้น - LiveDisplay สามารถช่วยลดอาการปวดตา และช่วยให้คุณนอนหลับในเวลากลางคืน คลิกที่นี่เพื่อลองใช้! ไม่มีอุปกรณ์เชื่อมต่อ %1$s อุปกรณ์เชื่อมต่ออยู่ diff --git a/core/res/res/values-tr/cm_strings.xml b/core/res/res/values-tr/cm_strings.xml index a1ff20b..7e31585 100644 --- a/core/res/res/values-tr/cm_strings.xml +++ b/core/res/res/values-tr/cm_strings.xml @@ -168,18 +168,6 @@ root erişimi al Bu ekranı kaldırmak için Geri tuşuna dokunun ve tutun. - - Otomatik - Gün batımı ve doğumundan sonra ekranın renk sıcaklığını otomatik ayarlar - Kapalı - Tüm ayarlamaları devre dışı bırak - Gündüz - Sadece gündüz ayarlarını kullan - Gece - Sadece gece ayarlarını kullan - Açık alan (parlak güneş) - Sadece açık alan ayarlarını kullan - LiveDisplay göz yorgunluğunuzu azaltıp geceleri uyumanıza yardımcı olabilir. Denemek için buraya tıklayın! Bağlı cihaz yok %1$s cihaz bağlı diff --git a/core/res/res/values-ug/cm_strings.xml b/core/res/res/values-ug/cm_strings.xml index 795dba9..c40799c 100644 --- a/core/res/res/values-ug/cm_strings.xml +++ b/core/res/res/values-ug/cm_strings.xml @@ -168,18 +168,6 @@ root ھوقۇقىغا ئېرىشىدۇ بۇ مۇقىم ئېكراننى يوق قىلىش ئۈچۈن، قايتىش كۇنۇپكىسىنى بېسىپ تۇرۇڭ. - - ئاپتوماتىك - كۈن چىققان ۋە كۈن پاتقاندىن كېيىن ئېكران رەڭ تېمپېراتورىسىنى ئۆزلۈكىدىن تەڭشەيدۇ - تاقاق - بارلىق تەڭشەشلەرنى چەكلەيدۇ - كۈندۈز - كۈندۈز تەڭشەكلىرىنىلا ئىشلىتىدۇ - كېچە - كېچە تەڭشەكلىرىنىلا ئىشلىتىدۇ - تالا (قۇياش نۇرى) - تالا تەڭشەكلىرىنىلا ئىشلىتىدۇ - LiveDisplay كۆزنىڭ چارچىشىنى يېنىكلىتىشكە ياردەم بېرىدۇ، كېچىدە ئۇخلىشىڭىزغا ياردەم بېرىدۇ. سىناش ئۈچۈن بۇ جاينى چېكىڭ! ئۇلانغان ئۈسكۈنە يوق %1$s ئۈسكۈنە ئۇلاندى diff --git a/core/res/res/values-uk/cm_strings.xml b/core/res/res/values-uk/cm_strings.xml index 15fb724..03b49d7 100644 --- a/core/res/res/values-uk/cm_strings.xml +++ b/core/res/res/values-uk/cm_strings.xml @@ -168,18 +168,6 @@ отримати root-доступ Щоб відкріпити цей екран, торкніться й утримуйте кнопку назад. - - Автоматично - Автоматичне підлаштування температури кольору екрана після сходу та заходу сонця - Вимк - Вимкнути авторегулювання - День - Використовувати параметри для денного освітлення - Ніч - Використовувати параметри для нічного освітлення - Надворі (яскраве сонце) - Використовувати параметри для яскравого освітлення надворі - LiveDisplay допоможе зменшити навантаження на зір та покращить Ваш сон. Натисніть тут, щоб спробувати його! Немає під\'єднаного пристрою %1$s підключений пристрій diff --git a/core/res/res/values-ur-rPK/cm_strings.xml b/core/res/res/values-ur-rPK/cm_strings.xml index 6dfdc6b..2ce9b8b 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 @@ - - Để bỏ ghim màn hình này, hãy chạm và giữ phím Quay lại. - - Tự động - Tự động chỉnh nhiệt độ màu của màn hình theo ngày và đêm - Tắt - Vô hiệu hoá tất cả điều chỉnh - Ngày - Chỉ sử dụng cài đặt ban ngày - Đêm - Chỉ sử dụng cài đặt ban đêm - Ngoài trời (ánh sáng mặt trời) - Chỉ sử dụng cài đặt ngoài trời - 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ử! Không có thiết bị kết nối %1$s thiết bị đã kết nối diff --git a/core/res/res/values-zh-rCN/cm_strings.xml b/core/res/res/values-zh-rCN/cm_strings.xml index 67b1256..6f522d1 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 @@ 获取 Root 权限 要取消固定此屏幕，触摸并按住返回键。 - - 自动 - 在日出和日落后自动调节屏幕色温 - 关闭 - 禁用所有调整 - 白天 - 仅使用白天设置 - 夜晚 - 仅使用夜晚设置 - 户外（阳光） - 仅使用户外设置 - LiveDisplay 可以帮助减少眼睛疲劳，帮助您的夜间睡眠。点击此处来试一试！ 没有已连接设备 %1$s 个已连接的设备 diff --git a/core/res/res/values-zh-rHK/cm_strings.xml b/core/res/res/values-zh-rHK/cm_strings.xml index 6d57333..7a738ea 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 @@ 編寫短訊 要解鎖此螢幕，觸碰並按住返回鍵。 - - 自動 - 在白天和夜晚自動調節螢幕顏色溫度 - 關閉 - 停用所有調整 - 白天 - 僅使用白天設定 - 夜間 - 僅使用夜間設定 - 戶外（陽光） - 僅使用戶外設定 - LiveDisplay 可有助減少眼睛疲勞，有助晚上睡眠。按下此處試試！ 沒有已連接的裝置 diff --git a/core/res/res/values-zh-rTW/cm_strings.xml b/core/res/res/values-zh-rTW/cm_strings.xml index f3d7547..6edafdb 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 @@ 取得 Root 權限 要解鎖此螢幕，觸摸並按住返回鍵。 - - 自動 - 在白天和夜晚自動調節螢幕顏色溫度 - 關閉 - 禁用所有的調整 - 白天 - 僅使用白天設定 - 夜間 - 僅使用夜間設定 - 戶外 (陽光) - 僅使用戶外設定 - LiveDisplay 可以幫助減少眼睛的疲勞及睡前使用造成的不適。輕觸此處來試試！ 沒有已連接的裝置 %1$s 個已連接裝置 diff --git a/core/res/res/values-zu/cm_strings.xml b/core/res/res/values-zu/cm_strings.xml index 6dfdc6b..2ce9b8b 100644 --- a/core/res/res/values-zu/cm_strings.xml +++ b/core/res/res/values-zu/cm_strings.xml @@ -56,7 +56,6 @@ - diff --git a/core/res/res/values/cm_strings.xml b/core/res/res/values/cm_strings.xml index d8f2b7c..a8fcbe5 100644 --- a/core/res/res/values/cm_strings.xml +++ b/core/res/res/values/cm_strings.xml @@ -192,19 +192,6 @@ To unpin this screen, touch and hold the Back button. - - LiveDisplay - Automatic - Automatically adjust color temperature of screen after sunset and sunrise - Off - Disable all adjustments - Day - Use day settings only - Night - Use night settings only - Outdoor (bright sun) - Use outdoor settings only - LiveDisplay can help reduce eyestrain and help you sleep at night. Click here to try it out! %s diff --git a/core/res/res/values/cm_symbols.xml b/core/res/res/values/cm_symbols.xml index a76b3c2..0e517b7 100644 --- a/core/res/res/values/cm_symbols.xml +++ b/core/res/res/values/cm_symbols.xml @@ -107,21 +107,6 @@ - - - - - - - - - - - - - - - diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 5cdce93..8629687 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2559,7 +2559,6 @@ - 6500 false diff --git a/packages/SystemUI/AndroidManifest_cm.xml b/packages/SystemUI/AndroidManifest_cm.xml index b13ac3b..6034b89 100644 --- a/packages/SystemUI/AndroidManifest_cm.xml +++ b/packages/SystemUI/AndroidManifest_cm.xml @@ -47,6 +47,9 @@ + + + { 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 { 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 { 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 { 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 { } 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 { 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 { } } - 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 { @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 1b4182d..4e4c249 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 1925ed3..eca6a2e 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 e8a857b..6a6570b 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 ae596cb..25e59d5 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 28f2432..0000000 --- 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 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 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")); - } -} -- cgit v1.1