diff options
104 files changed, 58 insertions, 1042 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6870873..451f370 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -86,6 +86,7 @@ <uses-permission android:name="cyanogenmod.permission.MODIFY_PROFILES" /> <uses-permission android:name="cyanogenmod.permission.PROTECTED_APP" /> <uses-permission android:name="cyanogenmod.permission.PERFORMANCE_ACCESS" /> + <uses-permission android:name="cyanogenmod.permission.MANAGE_LIVEDISPLAY" /> <application android:label="@string/settings_label" android:icon="@mipmap/ic_launcher_settings" @@ -2227,8 +2228,7 @@ android:excludeFromRecents="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> - <action android:name="android.settings.LIVEDISPLAY_SETTINGS" /> - <action android:name="com.android.settings.LIVEDISPLAY_SETTINGS" /> + <action android:name="cyanogenmod.settings.LIVEDISPLAY_SETTINGS" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.SHORTCUT" /> diff --git a/res/layout/display_gamma_calibration.xml b/res/layout/display_gamma_calibration.xml deleted file mode 100644 index db66f7f..0000000 --- a/res/layout/display_gamma_calibration.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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. ---> - -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout - android:id="@+id/gamma_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center_horizontal" - android:orientation="vertical" - android:paddingBottom="20dp" > - - <!-- children will be filled in dynamically --> - - </LinearLayout> -</ScrollView> diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml index cd878ec..d47185e 100644 --- a/res/values-af/cm_strings.xml +++ b/res/values-af/cm_strings.xml @@ -539,14 +539,7 @@ <string name="color_red_title">Rooi</string> <string name="color_green_title">Groen</string> <string name="color_blue_title">Blou</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gamma kalibrasie</string> - <string name="gamma_tuning_summary_head">Verstel gamma waardes</string> - <string name="gamma_tuning_control_set_header">Groep <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontras</string> - <string name="gamma_tuning_brightness">Helderheid</string> - <string name="gamma_tuning_saturation">Versadigingspunt</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Begin musiek program</string> <string name="headset_connect_player_summary">Begin die standaard musiek program wanneer oorfone gekoppel word</string> diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-am/cm_strings.xml +++ b/res/values-am/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml index feac856..6872e24 100644 --- a/res/values-ar/cm_strings.xml +++ b/res/values-ar/cm_strings.xml @@ -543,14 +543,7 @@ <string name="color_red_title">أحمر</string> <string name="color_green_title">أخضر</string> <string name="color_blue_title">أزرق</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">معايرة چاما</string> - <string name="gamma_tuning_summary_head">قيم Tweak gamma</string> - <string name="gamma_tuning_control_set_header">مجموعة <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">التباين</string> - <string name="gamma_tuning_brightness">السطوع</string> - <string name="gamma_tuning_saturation">التشبع</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">بدء تشغيل تطبيق الموسيقى</string> <string name="headset_connect_player_summary">بدء تشغيل تطبيق الموسيقى المبدئيّ عند توصيل سماعات الرأس</string> diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml index 833beda..422e3b0 100644 --- a/res/values-as-rIN/cm_strings.xml +++ b/res/values-as-rIN/cm_strings.xml @@ -538,14 +538,7 @@ <string name="color_red_title">ৰঙা</string> <string name="color_green_title">সেউজীয়া</string> <string name="color_blue_title">নীলা</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">গামা কেলিব্ৰেচন</string> - <string name="gamma_tuning_summary_head">টুইক গামাৰ মানবোৰ</string> - <string name="gamma_tuning_control_set_header">গ্ৰুপ <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">কনট্ৰাষ্ট</string> - <string name="gamma_tuning_brightness">উজ্বলতা</string> - <string name="gamma_tuning_saturation">পৰিপূৰ্ণ কৰা</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">সংগীত এপ্প্ লান্চ্চ কৰক</string> <string name="headset_connect_player_summary">হেডছেট সংযোগ কৰিলে ডিফ\'ল্ট সংগীত এপ্প লান্চ্চ কৰক</string> diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml index ccd72bc..2594c18 100644 --- a/res/values-ast-rES/cm_strings.xml +++ b/res/values-ast-rES/cm_strings.xml @@ -446,14 +446,7 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.< <string name="color_red_title">Bermeyu</string> <string name="color_green_title">Verde</string> <string name="color_blue_title">Azul</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Correición gamma</string> - <string name="gamma_tuning_summary_head">Axustar la correición gamma de la pantalla</string> - <string name="gamma_tuning_control_set_header">Grupu <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Contraste</string> - <string name="gamma_tuning_brightness">Brillu</string> - <string name="gamma_tuning_saturation">Saturación</string> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> <string name="wifi_auto_config_priorities">Prioridá automática</string> diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml index aecc7c4..29877b6 100644 --- a/res/values-az-rAZ/cm_strings.xml +++ b/res/values-az-rAZ/cm_strings.xml @@ -440,13 +440,7 @@ <string name="color_red_title">Qırmızı</string> <string name="color_green_title">Yaşıl</string> <string name="color_blue_title">Mavi</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Qamma kalibrasiyası</string> - <string name="gamma_tuning_summary_head">Qamma dəyərlərini düzəltin</string> - <string name="gamma_tuning_control_set_header">Qrup <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_brightness">Parlaqlıq</string> - <string name="gamma_tuning_saturation">Doydurma</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Musiqi tətbiqini başlat</string> <string name="headset_connect_player_summary">Qulaqcıq taxılanda musiqi tətbiqetməsini başladar</string> diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml index 3380d83..f34ba05 100644 --- a/res/values-be/cm_strings.xml +++ b/res/values-be/cm_strings.xml @@ -535,14 +535,7 @@ <string name="color_red_title">Чырвоны</string> <string name="color_green_title">Зялёны</string> <string name="color_blue_title">Сіні</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Гама</string> - <string name="gamma_tuning_summary_head">Налада гама-карэкцыі экрана</string> - <string name="gamma_tuning_control_set_header">Група <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Кантраснасць</string> - <string name="gamma_tuning_brightness">Яскравасць</string> - <string name="gamma_tuning_saturation">Насычанасць</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Аўтазапуск плэера</string> <string name="headset_connect_player_summary">Запускаць плэер пры падлучэнні завушнікаў</string> diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml index 40cde4a..4383293 100644 --- a/res/values-bg/cm_strings.xml +++ b/res/values-bg/cm_strings.xml @@ -540,14 +540,7 @@ <string name="color_red_title">Червен</string> <string name="color_green_title">Зелен</string> <string name="color_blue_title">Син</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Гама за калибриране</string> - <string name="gamma_tuning_summary_head">Настрой гама стойности</string> - <string name="gamma_tuning_control_set_header">Група <xliff:g id="index">%d </xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Контраст</string> - <string name="gamma_tuning_brightness">Яркост</string> - <string name="gamma_tuning_saturation">Насищане</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Стартиране на приложението за музика</string> <string name="headset_connect_player_summary">Стартира на приложението за музика, когато включите слушалките</string> diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml index bca10e7..86bc737 100644 --- a/res/values-bn-rBD/cm_strings.xml +++ b/res/values-bn-rBD/cm_strings.xml @@ -363,10 +363,6 @@ <string name="color_red_title">লাল</string> <string name="color_green_title">সবুজ</string> <string name="color_blue_title">নীল</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">গামা শক্তির পরিমাপ</string> - <string name="gamma_tuning_summary_head">টুইক গামার মান</string> - <string name="gamma_tuning_control_set_header">গ্রুপ <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-br-rFR/cm_strings.xml +++ b/res/values-br-rFR/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml index 9db75e5..3929844 100644 --- a/res/values-ca/cm_strings.xml +++ b/res/values-ca/cm_strings.xml @@ -540,14 +540,7 @@ <string name="color_red_title">Vermell</string> <string name="color_green_title">Verd</string> <string name="color_blue_title">Blau</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Calibració de gamma</string> - <string name="gamma_tuning_summary_head">Millora els valors gamma</string> - <string name="gamma_tuning_control_set_header">Grup <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Contrast</string> - <string name="gamma_tuning_brightness">Lluminositat</string> - <string name="gamma_tuning_saturation">Saturació</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Llança l\'aplicació de música</string> <string name="headset_connect_player_summary">Inicia l\'aplicació de música predeterminada quan es connectin els auriculars</string> diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml index 0169b98..d04aff5 100644 --- a/res/values-cs/cm_strings.xml +++ b/res/values-cs/cm_strings.xml @@ -541,14 +541,7 @@ <string name="color_red_title">Červená</string> <string name="color_green_title">Zelená</string> <string name="color_blue_title">Modrá</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gamma kalibrace</string> - <string name="gamma_tuning_summary_head">Přizpůsobení hodnot gamma</string> - <string name="gamma_tuning_control_set_header">Skupina <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontrast</string> - <string name="gamma_tuning_brightness">Jas</string> - <string name="gamma_tuning_saturation">Sytost</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Spustit aplikaci pro přehrávání hudby</string> <string name="headset_connect_player_summary">Pokud jsou připojena sluchátka, spustit výchozí aplikaci pro přehrávání hudby</string> diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-cy/cm_strings.xml +++ b/res/values-cy/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml index b257150..9a4470f 100644 --- a/res/values-da/cm_strings.xml +++ b/res/values-da/cm_strings.xml @@ -535,14 +535,7 @@ <string name="color_red_title">Rød</string> <string name="color_green_title">Grøn</string> <string name="color_blue_title">Blå</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gamma-kalibrering</string> - <string name="gamma_tuning_summary_head">Finindstil gammaværdier</string> - <string name="gamma_tuning_control_set_header">Gruppe <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontrast</string> - <string name="gamma_tuning_brightness">Lysstyrke</string> - <string name="gamma_tuning_saturation">Farvemætning</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Start musik-app</string> <string name="headset_connect_player_summary">Start standard-app til musik, når headset tilsluttes</string> diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml index 34c787b..72d0d7d 100644 --- a/res/values-de/cm_strings.xml +++ b/res/values-de/cm_strings.xml @@ -539,14 +539,7 @@ <string name="color_red_title">Rot</string> <string name="color_green_title">Grün</string> <string name="color_blue_title">Blau</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gammakorrektur</string> - <string name="gamma_tuning_summary_head">Gammawerte optimieren</string> - <string name="gamma_tuning_control_set_header">Gruppe <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontrast</string> - <string name="gamma_tuning_brightness">Helligkeit</string> - <string name="gamma_tuning_saturation">Sättigung</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Musik-App starten</string> <string name="headset_connect_player_summary">Beim Anschließen eines Kopfhörers die Standard-Musik-App starten</string> diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml index aa46de4..2d53970 100644 --- a/res/values-el/cm_strings.xml +++ b/res/values-el/cm_strings.xml @@ -540,14 +540,7 @@ <string name="color_red_title">Κόκκινο</string> <string name="color_green_title">Πράσινο</string> <string name="color_blue_title">Μπλε</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Βελτίωση γάμμα</string> - <string name="gamma_tuning_summary_head">Βελτίωση επιπέδων γάμμα της οθόνης</string> - <string name="gamma_tuning_control_set_header">Ομάδα <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Αντίθεση</string> - <string name="gamma_tuning_brightness">Φωτεινότητα</string> - <string name="gamma_tuning_saturation">Κορεσμός</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Εκκίνηση εφαρμογής μουσικής</string> <string name="headset_connect_player_summary">Εκκίνηση της προεπιλεγμένης εφαρμογής μουσικής κατά τη σύνδεση ακουστικών</string> diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml index 27d46c2..20806b2 100644 --- a/res/values-en-rAU/cm_strings.xml +++ b/res/values-en-rAU/cm_strings.xml @@ -453,14 +453,7 @@ <string name="color_red_title">Red</string> <string name="color_green_title">Green</string> <string name="color_blue_title">Blue</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gamma calibration</string> - <string name="gamma_tuning_summary_head">Tweak gamma values</string> - <string name="gamma_tuning_control_set_header">Group <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Contrast</string> - <string name="gamma_tuning_brightness">Brightness</string> - <string name="gamma_tuning_saturation">Saturation</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Launch music app</string> <string name="headset_connect_player_summary">Launch the default music app when headset is connected</string> diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-en-rGB/cm_strings.xml +++ b/res/values-en-rGB/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml index c84da7d..9adcaea 100644 --- a/res/values-en-rIN/cm_strings.xml +++ b/res/values-en-rIN/cm_strings.xml @@ -482,14 +482,7 @@ <string name="color_red_title">Red</string> <string name="color_green_title">Green</string> <string name="color_blue_title">Blue</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gamma calibration</string> - <string name="gamma_tuning_summary_head">Tweak gamma values</string> - <string name="gamma_tuning_control_set_header">Group <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Contrast</string> - <string name="gamma_tuning_brightness">Brightness</string> - <string name="gamma_tuning_saturation">Saturation</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Launch music app</string> <string name="headset_connect_player_summary">Launch the default music app when headset is connected</string> diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-en-rPT/cm_strings.xml +++ b/res/values-en-rPT/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml index 77f42ee..baf086a 100644 --- a/res/values-eo/cm_strings.xml +++ b/res/values-eo/cm_strings.xml @@ -465,14 +465,7 @@ <string name="color_red_title">Ruĝo</string> <string name="color_green_title">Verdo</string> <string name="color_blue_title">Bluo</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gama kalibrado</string> - <string name="gamma_tuning_summary_head">Alĝustigi gamajn valorojn</string> - <string name="gamma_tuning_control_set_header">Grupo <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontrasto</string> - <string name="gamma_tuning_brightness">Brileco</string> - <string name="gamma_tuning_saturation">Intenseco</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Lanĉi la muzik-ludilon</string> <string name="headset_connect_player_summary">Lanĉi la defaŭltan muzik-ludilon, kiam la kapaŭskultilo estas kontektita</string> diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml index 2ddbf25..0568f71 100644 --- a/res/values-es-rMX/cm_strings.xml +++ b/res/values-es-rMX/cm_strings.xml @@ -151,7 +151,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml index 9874cf8..a3b30cc 100644 --- a/res/values-es-rUS/cm_strings.xml +++ b/res/values-es-rUS/cm_strings.xml @@ -538,14 +538,7 @@ <string name="color_red_title">Rojo</string> <string name="color_green_title">Verde</string> <string name="color_blue_title">Azul</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Corrección gamma</string> - <string name="gamma_tuning_summary_head">Ajustar la corrección gamma de la pantalla</string> - <string name="gamma_tuning_control_set_header">Grupo <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Contraste</string> - <string name="gamma_tuning_brightness">Brillo</string> - <string name="gamma_tuning_saturation">Saturación</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Iniciar el reproductor de música</string> <string name="headset_connect_player_summary">Iniciar el reproductor de música predeterminado al conectar los auriculares</string> diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml index 5c4680e..033189a 100644 --- a/res/values-es/cm_strings.xml +++ b/res/values-es/cm_strings.xml @@ -539,14 +539,7 @@ <string name="color_red_title">Rojo</string> <string name="color_green_title">Verde</string> <string name="color_blue_title">Azul</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Corrección gamma</string> - <string name="gamma_tuning_summary_head">Ajustar la corrección gamma</string> - <string name="gamma_tuning_control_set_header">Grupo <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Contraste</string> - <string name="gamma_tuning_brightness">Brillo</string> - <string name="gamma_tuning_saturation">Saturación</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Iniciar reproductor de música</string> <string name="headset_connect_player_summary">Iniciar el reproductor de música por defecto al conectar los auriculares</string> diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml index 53ae0fa..b7c3683 100644 --- a/res/values-et-rEE/cm_strings.xml +++ b/res/values-et-rEE/cm_strings.xml @@ -473,14 +473,7 @@ <string name="color_red_title">Punane</string> <string name="color_green_title">Roheline</string> <string name="color_blue_title">Sinine</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Heleduse kalibreerimine</string> - <string name="gamma_tuning_summary_head">Kohenda heleduse väärtuseid</string> - <string name="gamma_tuning_control_set_header">Rühmita <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontrast</string> - <string name="gamma_tuning_brightness">Heledus</string> - <string name="gamma_tuning_saturation">Küllastus</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Käivita muusika rakendus</string> <string name="headset_connect_player_summary">Käivita vaikimisi muusika rakendus peakomplekti ühendamisel</string> diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml index 95ae2cf..71aa9ea 100644 --- a/res/values-eu-rES/cm_strings.xml +++ b/res/values-eu-rES/cm_strings.xml @@ -540,14 +540,7 @@ <string name="color_red_title">Gorria</string> <string name="color_green_title">Berdea</string> <string name="color_blue_title">Urdina</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gamma kalibrazioa</string> - <string name="gamma_tuning_summary_head">Doitu gamma balioak</string> - <string name="gamma_tuning_control_set_header"><xliff:g id="index">%d</xliff:g> taldea</string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontrastea</string> - <string name="gamma_tuning_brightness">Distira</string> - <string name="gamma_tuning_saturation">Saturazioa</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Abiatu musika erreproduzigailua</string> <string name="headset_connect_player_summary">Abiatu musika erreproduzigailu lehenetsia aurikularrak konektatzean</string> diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml index 01b1e06..74d7202 100644 --- a/res/values-fa/cm_strings.xml +++ b/res/values-fa/cm_strings.xml @@ -474,14 +474,7 @@ <string name="color_red_title">قرمز</string> <string name="color_green_title">سبز</string> <string name="color_blue_title">آبی</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">تنظیم گاما</string> - <string name="gamma_tuning_summary_head">تغییر جزئی مقادیر گاما</string> - <string name="gamma_tuning_control_set_header">گروه <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">کنتراست</string> - <string name="gamma_tuning_brightness">روشنایی</string> - <string name="gamma_tuning_saturation">اشباع</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">اجرای برنامه موسیقی</string> <string name="headset_connect_player_summary">هنگام اتصال هدست برنامه پیشفرض موسیقی اجرا شود</string> diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml index cb7c335..9b0eaac 100644 --- a/res/values-fi/cm_strings.xml +++ b/res/values-fi/cm_strings.xml @@ -540,14 +540,7 @@ <string name="color_red_title">Punainen</string> <string name="color_green_title">Vihreä</string> <string name="color_blue_title">Sininen</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gammakalibrointi</string> - <string name="gamma_tuning_summary_head">Muokkaa gamma-arvoja</string> - <string name="gamma_tuning_control_set_header">Ryhmä <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontrasti</string> - <string name="gamma_tuning_brightness">Kirkkaus</string> - <string name="gamma_tuning_saturation">Kylläisyys</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Käynnistä musiikkisovellus</string> <string name="headset_connect_player_summary">Käynnistä musiikkisovellus kytkettäessä kuulokkeet</string> diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-fil-rPH/cm_strings.xml +++ b/res/values-fil-rPH/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-fr-rCA/cm_strings.xml +++ b/res/values-fr-rCA/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml index a3ebbe5..f8ba3e5 100644 --- a/res/values-fr/cm_strings.xml +++ b/res/values-fr/cm_strings.xml @@ -539,14 +539,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a <string name="color_red_title">Rouge</string> <string name="color_green_title">Vert</string> <string name="color_blue_title">Bleu</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Calibrage du gamma</string> - <string name="gamma_tuning_summary_head">Ajuster les valeurs du gamma</string> - <string name="gamma_tuning_control_set_header">Groupe <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Contraste</string> - <string name="gamma_tuning_brightness">Luminosité</string> - <string name="gamma_tuning_saturation">Saturation</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Lancer le lecteur de musique</string> <string name="headset_connect_player_summary">Lancer le lecteur de musique par défaut au branchement du casque</string> diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-frp-rIT/cm_strings.xml +++ b/res/values-frp-rIT/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml index bb3faa1..08b695e 100644 --- a/res/values-fy-rNL/cm_strings.xml +++ b/res/values-fy-rNL/cm_strings.xml @@ -92,7 +92,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-gd-rGB/cm_strings.xml +++ b/res/values-gd-rGB/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml index 3073904..2cd2760 100644 --- a/res/values-gl-rES/cm_strings.xml +++ b/res/values-gl-rES/cm_strings.xml @@ -284,7 +284,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml index 63e8020..8c60e18 100644 --- a/res/values-gu-rIN/cm_strings.xml +++ b/res/values-gu-rIN/cm_strings.xml @@ -539,14 +539,7 @@ <string name="color_red_title">લાલ</string> <string name="color_green_title">લીલો</string> <string name="color_blue_title">વાદળી</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">ગામા અનુમાપન</string> - <string name="gamma_tuning_summary_head">ગામા મૂલ્યો મરડો</string> - <string name="gamma_tuning_control_set_header">જૂથ <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">વિપરીત</string> - <string name="gamma_tuning_brightness">તેજ</string> - <string name="gamma_tuning_saturation">સંતૃપ્તિ</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">મ્યુઝિક એપ્લિકેશન લૉન્ચ કરો</string> <string name="headset_connect_player_summary">જ્યારે હેડસેટ જોડાયેલ હોય ત્યારે ડિફૉલ્ટ મ્યુઝિક એપ્લિકેશન લૉન્ચ કરો</string> diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml index 6ccfb34..ecb23ed 100644 --- a/res/values-hi/cm_strings.xml +++ b/res/values-hi/cm_strings.xml @@ -471,14 +471,7 @@ <string name="color_red_title">लाल</string> <string name="color_green_title">हरा</string> <string name="color_blue_title">नीला</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">गामा अंशांकन</string> - <string name="gamma_tuning_summary_head">गामा मानों को समायोजित करें</string> - <string name="gamma_tuning_control_set_header">समूह <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">कोंट्रास्ट</string> - <string name="gamma_tuning_brightness">चमक</string> - <string name="gamma_tuning_saturation">संतृप्ति</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">संगीत ऐप को चालू करें</string> <string name="headset_connect_player_summary">जब हेटसेट कनेक्ट किया जाए, तो डिफ़ॉल्ट संगीत ऐप को चालू करें</string> diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml index 7f157bd..14753e7 100644 --- a/res/values-hr/cm_strings.xml +++ b/res/values-hr/cm_strings.xml @@ -540,14 +540,7 @@ <string name="color_red_title">Crvena</string> <string name="color_green_title">Zelena</string> <string name="color_blue_title">Plava</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gama kalibracije</string> - <string name="gamma_tuning_summary_head">Podesi gama vrijednosti</string> - <string name="gamma_tuning_control_set_header">Grupa <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontrast</string> - <string name="gamma_tuning_brightness">Svjetlina</string> - <string name="gamma_tuning_saturation">Zasićenje</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Pokretanje aplikacije za glazbu</string> <string name="headset_connect_player_summary">Pokreni zadanu aplikaciju za glazbu kada su priključene slušalice</string> diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml index cb78ffa..950672a 100644 --- a/res/values-hu/cm_strings.xml +++ b/res/values-hu/cm_strings.xml @@ -539,14 +539,7 @@ <string name="color_red_title">Vörös</string> <string name="color_green_title">Zöld</string> <string name="color_blue_title">Kék</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gamma kalibrálás</string> - <string name="gamma_tuning_summary_head">Gamma értékek finomhangolása</string> - <string name="gamma_tuning_control_set_header">Csoport <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontraszt</string> - <string name="gamma_tuning_brightness">Fényerő</string> - <string name="gamma_tuning_saturation">Telítettség</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Zenelejátszó indítása</string> <string name="headset_connect_player_summary">Alapértelmezett zenelejátszó elindítása fülhallgató csatlakoztatásakor</string> diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-hy-rAM/cm_strings.xml +++ b/res/values-hy-rAM/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-in/cm_strings.xml +++ b/res/values-in/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-is-rIS/cm_strings.xml +++ b/res/values-is-rIS/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml index 919d54a..a9f34a7 100644 --- a/res/values-it/cm_strings.xml +++ b/res/values-it/cm_strings.xml @@ -540,14 +540,7 @@ <string name="color_red_title">Rosso</string> <string name="color_green_title">Verde</string> <string name="color_blue_title">Blu</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Calibrazione gamma</string> - <string name="gamma_tuning_summary_head">Modifica i valori gamma</string> - <string name="gamma_tuning_control_set_header">Gruppo <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Contrasto</string> - <string name="gamma_tuning_brightness">Luminosità</string> - <string name="gamma_tuning_saturation">Saturazione</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Avvia lettore musicale</string> <string name="headset_connect_player_summary">Lancia il lettore musicale predefinito quando vengono connesse le cuffie</string> diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml index 75a53e8..ca34560 100644 --- a/res/values-iw/cm_strings.xml +++ b/res/values-iw/cm_strings.xml @@ -540,14 +540,7 @@ <string name="color_red_title">אדום</string> <string name="color_green_title">ירוק</string> <string name="color_blue_title">כחול</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">כיול גאמא</string> - <string name="gamma_tuning_summary_head">שנה ערכי גאמא</string> - <string name="gamma_tuning_control_set_header">קבוצה <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">ניגודיות</string> - <string name="gamma_tuning_brightness">בהירות</string> - <string name="gamma_tuning_saturation">רוויה</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">הפעל נגן מוזיקה</string> <string name="headset_connect_player_summary">הפעל את נגן המוזיקה המוגדר כברירת המחדל בעת חיבור אוזניות</string> diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml index 473fd90..129bdc5 100644 --- a/res/values-ja/cm_strings.xml +++ b/res/values-ja/cm_strings.xml @@ -538,14 +538,7 @@ <string name="color_red_title">赤</string> <string name="color_green_title">緑</string> <string name="color_blue_title">青</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">ガンマ調整</string> - <string name="gamma_tuning_summary_head">ガンマ値を調整する</string> - <string name="gamma_tuning_control_set_header">グループ<xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">コントラスト</string> - <string name="gamma_tuning_brightness">輝度</string> - <string name="gamma_tuning_saturation">彩度</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">音楽アプリを起動</string> <string name="headset_connect_player_summary">ヘッドセット接続時にデフォルトの音楽アプリを起動する</string> diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-ka-rGE/cm_strings.xml +++ b/res/values-ka-rGE/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-kk-rKZ/cm_strings.xml +++ b/res/values-kk-rKZ/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-km-rKH/cm_strings.xml +++ b/res/values-km-rKH/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml index 4ed2a43..7fadff4 100644 --- a/res/values-kn-rIN/cm_strings.xml +++ b/res/values-kn-rIN/cm_strings.xml @@ -538,14 +538,7 @@ <string name="color_red_title">ಕೆಂಪು</string> <string name="color_green_title">ಹಸಿರು</string> <string name="color_blue_title">ನೀಲಿ</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">ಗಾಮಾ ಮಾಪನಾಂಕ</string> - <string name="gamma_tuning_summary_head">ಗಾಮಾ ಮೌಲ್ಯಗಳನ್ನು ತಿರುಚಿ</string> - <string name="gamma_tuning_control_set_header">ಗುಂಪು <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">ಕಾಂಟ್ರಾಸ್ಟ್</string> - <string name="gamma_tuning_brightness">ಪ್ರಖರತೆ</string> - <string name="gamma_tuning_saturation">ಸ್ಯಾಚುರೇಶನ್</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">ಮ್ಯೂಸಿಕ್ ಆಪ್ ತೆರೆ</string> <string name="headset_connect_player_summary">ಹೆಡ್ಸೆಟ್ ಸಂಪರ್ಕಗೊಂಡಾಗ ಡೀಫಾಲ್ಟ್ ಮ್ಯೂಸಿಕ್ ಆಪ್ ಆರಂಭಿಸು</string> diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml index b46ac17..299c39c 100644 --- a/res/values-ko/cm_strings.xml +++ b/res/values-ko/cm_strings.xml @@ -537,14 +537,7 @@ <string name="color_red_title">빨강</string> <string name="color_green_title">초록</string> <string name="color_blue_title">파랑</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">감마 보정</string> - <string name="gamma_tuning_summary_head">감마 값을 조정합니다</string> - <string name="gamma_tuning_control_set_header">그룹 <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">명암비</string> - <string name="gamma_tuning_brightness">밝기</string> - <string name="gamma_tuning_saturation">채도</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">음악 앱 실행</string> <string name="headset_connect_player_summary">헤드셋이 연결되면 기본 음악 앱 실행</string> diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml index bab94a6..8c5a989 100644 --- a/res/values-ku/cm_strings.xml +++ b/res/values-ku/cm_strings.xml @@ -453,14 +453,7 @@ <string name="color_red_title">سور</string> <string name="color_green_title">سهوز</string> <string name="color_blue_title">شین</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">کالیبرهیشنی سێیهم</string> - <string name="gamma_tuning_summary_head">بههای تویک</string> - <string name="gamma_tuning_control_set_header">کۆمەڵ<xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">جیاوازی</string> - <string name="gamma_tuning_brightness">ڕوناکی</string> - <string name="gamma_tuning_saturation">تێرایی</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">کردنهوهی بهرنامهی دهنگ</string> <string name="headset_connect_player_summary">کردنهوهی بهرنامهی مۆسیقای بنهڕهتی کاتێک بڵندگۆ پهیوهندکرا</string> diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-ky-rKG/cm_strings.xml +++ b/res/values-ky-rKG/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml index dc23497..c3e5571 100644 --- a/res/values-lb/cm_strings.xml +++ b/res/values-lb/cm_strings.xml @@ -476,14 +476,7 @@ <string name="color_red_title">Rout</string> <string name="color_green_title">Gréng</string> <string name="color_blue_title">Blo</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gammakorrektur</string> - <string name="gamma_tuning_summary_head">Gammawäerter astellen</string> - <string name="gamma_tuning_control_set_header">Grupp <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontrast</string> - <string name="gamma_tuning_brightness">Hellegkeet</string> - <string name="gamma_tuning_saturation">Faarfsättegung</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Musek-App starten</string> <string name="headset_connect_player_summary">Wa Kopfhörer verbonne ginn, gëtt Standard-Musek-App gestart</string> diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-lo-rLA/cm_strings.xml +++ b/res/values-lo-rLA/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml index 6a0f0cd..b5275f8 100644 --- a/res/values-lt/cm_strings.xml +++ b/res/values-lt/cm_strings.xml @@ -476,14 +476,7 @@ <string name="color_red_title">Raudona</string> <string name="color_green_title">Žalia</string> <string name="color_blue_title">Mėlyna</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gama kalibravimas</string> - <string name="gamma_tuning_summary_head">Reguliuoti gama reikšmes</string> - <string name="gamma_tuning_control_set_header">Grupė <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontrastas</string> - <string name="gamma_tuning_brightness">Šviesumas</string> - <string name="gamma_tuning_saturation">Saturacija</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Paleisti muzikos programą</string> <string name="headset_connect_player_summary">Paleisti numatytąją muzikos programą, kai prijungiama laisvų rankų įranga</string> diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml index 2cd55a1..2af1dc6 100644 --- a/res/values-lv/cm_strings.xml +++ b/res/values-lv/cm_strings.xml @@ -355,10 +355,6 @@ <string name="color_red_title">Sarkans</string> <string name="color_green_title">Zaļš</string> <string name="color_blue_title">Zils</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gamma kalibrēšana</string> - <string name="gamma_tuning_summary_head">Piedarīt gamma vērtības</string> - <string name="gamma_tuning_control_set_header">Grupa <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-mk-rMK/cm_strings.xml +++ b/res/values-mk-rMK/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml index 74d69aa..c2750bc 100644 --- a/res/values-ml-rIN/cm_strings.xml +++ b/res/values-ml-rIN/cm_strings.xml @@ -538,14 +538,7 @@ <string name="color_red_title">ചുവപ്പ്</string> <string name="color_green_title">പച്ച</string> <string name="color_blue_title">നീല</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">ഗാമാ കാലിബ്രേഷൻ</string> - <string name="gamma_tuning_summary_head">ഗാമാ മൂല്യങ്ങൾ വലിക്കുക</string> - <string name="gamma_tuning_control_set_header">ഗ്രൂപ്പ് <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">ദൃശ്യതീവ്രത</string> - <string name="gamma_tuning_brightness">തെളിച്ചം</string> - <string name="gamma_tuning_saturation">സാച്ചുറേഷൻ</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">സംഗീത ആപ്ലിക്കേഷൻ ആരംഭിക്കുക</string> <string name="headset_connect_player_summary">ഹെഡ്സെറ്റ് ഘടിപ്പിച്ചിരിക്കുമ്പോള് ഡിഫോള്ട്ട് സംഗീത ആപ്ലിക്കേഷൻ ആരംഭിക്കുക</string> diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-mn-rMN/cm_strings.xml +++ b/res/values-mn-rMN/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml index bab9c5e..0cea6cc 100644 --- a/res/values-mr-rIN/cm_strings.xml +++ b/res/values-mr-rIN/cm_strings.xml @@ -538,14 +538,7 @@ <string name="color_red_title">लाल</string> <string name="color_green_title">हिरवा</string> <string name="color_blue_title">निळा</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">गामा कॅलिब्रेशन</string> - <string name="gamma_tuning_summary_head">ट्वीक गामा मूल्ये</string> - <string name="gamma_tuning_control_set_header">समूह <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">तीव्रता</string> - <string name="gamma_tuning_brightness">चकाकी</string> - <string name="gamma_tuning_saturation">संपृक्तता</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">संगीत अनुप्रयोग सुरू करा</string> <string name="headset_connect_player_summary">जेव्हा हेडसेट कनेक्ट केलेला असेल तेव्हा डिफॉल्ट संगीत अनुप्रयोग सुरू करा</string> diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-ms-rMY/cm_strings.xml +++ b/res/values-ms-rMY/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-my-rMM/cm_strings.xml +++ b/res/values-my-rMM/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml index f2a1e52..313c61e 100644 --- a/res/values-nb/cm_strings.xml +++ b/res/values-nb/cm_strings.xml @@ -516,14 +516,7 @@ <string name="color_red_title">Rød</string> <string name="color_green_title">Grønn</string> <string name="color_blue_title">Blå</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gamma kalibrering</string> - <string name="gamma_tuning_summary_head">Justere gammaverdiene</string> - <string name="gamma_tuning_control_set_header">Gruppe <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontrast</string> - <string name="gamma_tuning_brightness">Lysstyrke</string> - <string name="gamma_tuning_saturation">Metning</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Start musikk app</string> <string name="headset_connect_player_summary">Start standard musikk app når hodesett er tilkoblet</string> diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-ne-rNP/cm_strings.xml +++ b/res/values-ne-rNP/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml index d9cdbd0..7acfc41 100644 --- a/res/values-nl/cm_strings.xml +++ b/res/values-nl/cm_strings.xml @@ -539,14 +539,7 @@ <string name="color_red_title">Rood</string> <string name="color_green_title">Groen</string> <string name="color_blue_title">Blauw</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gammakalibratie</string> - <string name="gamma_tuning_summary_head">Gammawaarden aanpassen</string> - <string name="gamma_tuning_control_set_header">Groep <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Contrast</string> - <string name="gamma_tuning_brightness">Helderheid</string> - <string name="gamma_tuning_saturation">Verzadiging</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Muziek-app openen</string> <string name="headset_connect_player_summary">Standaardmuziek-app openen bij aansluiten headset</string> diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-oc-rFR/cm_strings.xml +++ b/res/values-oc-rFR/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml index 34c74e8..41f85836 100644 --- a/res/values-or-rIN/cm_strings.xml +++ b/res/values-or-rIN/cm_strings.xml @@ -538,14 +538,7 @@ <string name="color_red_title">ଲାଲ୍</string> <string name="color_green_title">ସବୁଜ</string> <string name="color_blue_title">ନୀଳ</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">ଗାମା କାଲିବ୍ରେସନ୍</string> - <string name="gamma_tuning_summary_head">ଗାମା ମୂଲ୍ୟ ଟ୍ୱିକ୍ କରନ୍ତୁ</string> - <string name="gamma_tuning_control_set_header">ଗୋଷ୍ଠୀ <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">କଣ୍ଟ୍ରାଷ୍ଟ</string> - <string name="gamma_tuning_brightness">ଔଜଲ୍ୟତା</string> - <string name="gamma_tuning_saturation">ସମ୍ପୃକ୍ତି</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">ମ୍ୟୁଜିକ୍ ଆପ୍ଲିକେସନ୍ ଉନ୍ମୋଚନ କରନ୍ତୁ</string> <string name="headset_connect_player_summary">ହେଡ୍ସେଟ୍ ସଂଯୋଗ ହୋଇଥିବା ସମୟରେ ଡିଫଲ୍ଟ ମ୍ୟୁଜିକ୍ ଆପ୍ଲିକେସନ୍ ଲଞ୍ଚ କରନ୍ତୁ</string> diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-pa-rIN/cm_strings.xml +++ b/res/values-pa-rIN/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml index 6243e94..0b1d8c0 100644 --- a/res/values-pl/cm_strings.xml +++ b/res/values-pl/cm_strings.xml @@ -535,14 +535,7 @@ <string name="color_red_title">Czerwony</string> <string name="color_green_title">Zielony</string> <string name="color_blue_title">Niebieski</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Kalibracja gamma</string> - <string name="gamma_tuning_summary_head">Tuning wartości gamma</string> - <string name="gamma_tuning_control_set_header">Grupa <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontrast</string> - <string name="gamma_tuning_brightness">Jasność</string> - <string name="gamma_tuning_saturation">Nasycenie</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Uruchom aplikację muzyki</string> <string name="headset_connect_player_summary">Uruchom domyślną aplikację muzyki po podłączeniu słuchawek</string> diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml index a0ffd30..4611b4b 100644 --- a/res/values-pt-rBR/cm_strings.xml +++ b/res/values-pt-rBR/cm_strings.xml @@ -536,14 +536,7 @@ <string name="color_red_title">Vermelho</string> <string name="color_green_title">Verde</string> <string name="color_blue_title">Azul</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Calibrar gama</string> - <string name="gamma_tuning_summary_head">Ajustar valores de gama</string> - <string name="gamma_tuning_control_set_header">Grupo <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Contraste</string> - <string name="gamma_tuning_brightness">Brilho</string> - <string name="gamma_tuning_saturation">Saturação</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Abrir aplicativo de música</string> <string name="headset_connect_player_summary">Abrir o aplicativo de música padrão quando os fones de ouvido forem conectados</string> diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml index 274ec5f..60cd964 100644 --- a/res/values-pt-rPT/cm_strings.xml +++ b/res/values-pt-rPT/cm_strings.xml @@ -540,14 +540,7 @@ <string name="color_red_title">Vermelho</string> <string name="color_green_title">Verde</string> <string name="color_blue_title">Azul</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Calibração gama</string> - <string name="gamma_tuning_summary_head">Ajustar valores gama</string> - <string name="gamma_tuning_control_set_header">Grupo <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Contraste</string> - <string name="gamma_tuning_brightness">Brilho</string> - <string name="gamma_tuning_saturation">Saturação</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Iniciar a aplicação de música</string> <string name="headset_connect_player_summary">Iniciar a aplicação de música predefinida quando ligar os auscultadores</string> diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-rm/cm_strings.xml +++ b/res/values-rm/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml index e908d45..c04384b 100644 --- a/res/values-ro/cm_strings.xml +++ b/res/values-ro/cm_strings.xml @@ -510,14 +510,7 @@ <string name="color_red_title">Roșu</string> <string name="color_green_title">Verde</string> <string name="color_blue_title">Albastru</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Calibrare gama</string> - <string name="gamma_tuning_summary_head">Modificare valori gama</string> - <string name="gamma_tuning_control_set_header">Grup <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Contrast</string> - <string name="gamma_tuning_brightness">Luminozitate</string> - <string name="gamma_tuning_saturation">Saturație</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Lansează aplicație muzică</string> <string name="headset_connect_player_summary">Lansează aplicația implicită de muzică când se conectează casca audio</string> diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml index 38dd1ce..46be554 100644 --- a/res/values-ru/cm_strings.xml +++ b/res/values-ru/cm_strings.xml @@ -540,14 +540,7 @@ <string name="color_red_title">Красный</string> <string name="color_green_title">Зеленый</string> <string name="color_blue_title">Синий</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Гамма</string> - <string name="gamma_tuning_summary_head">Настройка гамма-коррекции экрана</string> - <string name="gamma_tuning_control_set_header">Группа <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Контрастность</string> - <string name="gamma_tuning_brightness">Яркость</string> - <string name="gamma_tuning_saturation">Насыщенность</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Автозапуск плеера</string> <string name="headset_connect_player_summary">Запускать плеер при подключении наушников</string> diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml index cce1706..87c21e6 100644 --- a/res/values-si-rLK/cm_strings.xml +++ b/res/values-si-rLK/cm_strings.xml @@ -363,10 +363,6 @@ <string name="color_red_title">රතු</string> <string name="color_green_title">කොළ</string> <string name="color_blue_title">නිල්</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">ගැමා ප්රමාණ ශෝධනය</string> - <string name="gamma_tuning_summary_head">ගැමා අගයන් සීරුමාරු කරන්න</string> - <string name="gamma_tuning_control_set_header"><xliff:g id="index">%d</xliff:g> කණ්ඩායම</string> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml index 0e3e1eb..4b94cc9 100644 --- a/res/values-sk/cm_strings.xml +++ b/res/values-sk/cm_strings.xml @@ -476,14 +476,7 @@ <string name="color_red_title">Červená</string> <string name="color_green_title">Zelená</string> <string name="color_blue_title">Modrá</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Kalibrácia gamma</string> - <string name="gamma_tuning_summary_head">Vylepšiť hodnoty gamma</string> - <string name="gamma_tuning_control_set_header">Skupina <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontrast</string> - <string name="gamma_tuning_brightness">Jas</string> - <string name="gamma_tuning_saturation">Sýtosť</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Spustiť aplikáciu na prehrávanie hudby</string> <string name="headset_connect_player_summary">Spustiť predvolenú aplikáciu na prehrávanie hudby po pripojení slúchadiel</string> diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml index f5ba62c..c3a7192 100644 --- a/res/values-sl/cm_strings.xml +++ b/res/values-sl/cm_strings.xml @@ -542,14 +542,7 @@ <string name="color_red_title">Rdeča</string> <string name="color_green_title">Zelena</string> <string name="color_blue_title">Modra</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Umerjanje gama</string> - <string name="gamma_tuning_summary_head">Prilagodi vrednosti gama</string> - <string name="gamma_tuning_control_set_header">Skupina <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontrast</string> - <string name="gamma_tuning_brightness">Svetlost</string> - <string name="gamma_tuning_saturation">Nasičenost</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Zaženi aplikacijo za glasbo</string> <string name="headset_connect_player_summary">Zaženi privzeto aplikacijo za glasbo, ko so priključene slušalke</string> diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-sq-rAL/cm_strings.xml +++ b/res/values-sq-rAL/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml index 0acfd95..1df7150 100644 --- a/res/values-sr/cm_strings.xml +++ b/res/values-sr/cm_strings.xml @@ -541,14 +541,7 @@ <string name="color_red_title">Црвена</string> <string name="color_green_title">Зелена</string> <string name="color_blue_title">Плава</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Гама калибрација</string> - <string name="gamma_tuning_summary_head">Штипање гама вредности</string> - <string name="gamma_tuning_control_set_header">Група <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Контраст</string> - <string name="gamma_tuning_brightness">Осветљеност</string> - <string name="gamma_tuning_saturation">Засићење</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Покрени музичку апликацију</string> <string name="headset_connect_player_summary">Покрени подразумевану музичку апликацију када су слушалице повезане</string> diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml index 9aef4f3..b18f763 100644 --- a/res/values-sv/cm_strings.xml +++ b/res/values-sv/cm_strings.xml @@ -539,14 +539,7 @@ <string name="color_red_title">Röd</string> <string name="color_green_title">Grön</string> <string name="color_blue_title">Blå</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gammakalibrering</string> - <string name="gamma_tuning_summary_head">Justera gammavärden</string> - <string name="gamma_tuning_control_set_header">Grupp <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Kontrast</string> - <string name="gamma_tuning_brightness">Ljusstyrka</string> - <string name="gamma_tuning_saturation">Mättnad</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Öppna musikapp</string> <string name="headset_connect_player_summary">Öppna standardmusikapp när hörlurar kopplas in</string> diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-sw/cm_strings.xml +++ b/res/values-sw/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml index ed5838c..0bf68bd 100644 --- a/res/values-ta-rIN/cm_strings.xml +++ b/res/values-ta-rIN/cm_strings.xml @@ -538,14 +538,7 @@ <string name="color_red_title">சிவப்பு</string> <string name="color_green_title">பச்சை</string> <string name="color_blue_title">நீலம்</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">காமா அளவிடுதல்</string> - <string name="gamma_tuning_summary_head">டிவீக் காமா மதிப்புகள்</string> - <string name="gamma_tuning_control_set_header">குழு <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">மாறுபாடு</string> - <string name="gamma_tuning_brightness">ஒளிர்வு</string> - <string name="gamma_tuning_saturation">சாச்சுரேசன்</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">இசை ஆப்-ஐ தொடங்குக</string> <string name="headset_connect_player_summary">ஹெட்செட் இணைக்கப்பட்டு இருக்கும்போது இயல்நிலை இசை ஆப்-ஐ தொடங்குக</string> diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml index 3222b6e..dd5bc2a 100644 --- a/res/values-te-rIN/cm_strings.xml +++ b/res/values-te-rIN/cm_strings.xml @@ -538,14 +538,7 @@ <string name="color_red_title">ఎరుపు రంగు</string> <string name="color_green_title">పచ్చ రంగు</string> <string name="color_blue_title">నీలి రంగు</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">గామా క్రమాంకనం</string> - <string name="gamma_tuning_summary_head">గామా విలువలు సర్దుబాటు చేయుము</string> - <string name="gamma_tuning_control_set_header">సమూహం <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">వ్యత్యాసం</string> - <string name="gamma_tuning_brightness">ప్రకాశం</string> - <string name="gamma_tuning_saturation">సంతృప్తత</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">సంగీతాన్ని ప్రారంభించు అనువర్తనం</string> <string name="headset_connect_player_summary">హెడ్ సెట్ అనుసంధానించబడి ఉన్నప్పుడు స్వయంసిద్ధ సంగీతం అనువర్తనాన్ని ప్రారంభించుము</string> diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml index c086067..feaf136 100644 --- a/res/values-th/cm_strings.xml +++ b/res/values-th/cm_strings.xml @@ -538,14 +538,7 @@ <string name="color_red_title">แดง</string> <string name="color_green_title">เขียว</string> <string name="color_blue_title">น้ำเงิน</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">การปรับเทียบแกมม่า</string> - <string name="gamma_tuning_summary_head">ปรับแต่งค่าแกมม่า</string> - <string name="gamma_tuning_control_set_header">กลุ่ม <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">สีตัด</string> - <string name="gamma_tuning_brightness">ความสว่าง</string> - <string name="gamma_tuning_saturation">ความอิ่มตัว</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">เปิดแอปเล่นเพลง</string> <string name="headset_connect_player_summary">เปิดแอปเล่นเพลงค่าเริ่มต้นเมื่อมีการเชื่อมต่อจากช่องหูฟัง</string> diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml index e12560a..e790c4d 100644 --- a/res/values-tr/cm_strings.xml +++ b/res/values-tr/cm_strings.xml @@ -539,14 +539,7 @@ <string name="color_red_title">Kırmızı</string> <string name="color_green_title">Yeşil</string> <string name="color_blue_title">Mavi</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gamma kalibrasyonu</string> - <string name="gamma_tuning_summary_head">Gamma değerlerini ayarlayın</string> - <string name="gamma_tuning_control_set_header">Grup <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Karşıtlık</string> - <string name="gamma_tuning_brightness">Parlaklık</string> - <string name="gamma_tuning_saturation">Doygunluk</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Müzik uygulamasını başlat</string> <string name="headset_connect_player_summary">Kulaklık bağlandığında müzik uygulamasını başlatır</string> diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml index c95a0a0..78fc9d3 100644 --- a/res/values-ug/cm_strings.xml +++ b/res/values-ug/cm_strings.xml @@ -538,14 +538,7 @@ <string name="color_red_title">قىزىل</string> <string name="color_green_title">يېشىل</string> <string name="color_blue_title">كۆك</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">گامما توغرىلاش</string> - <string name="gamma_tuning_summary_head">گامما قىممىتىنى تەڭشەش</string> - <string name="gamma_tuning_control_set_header">گۇرۇپپا <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">ئاق-قارىلىقى</string> - <string name="gamma_tuning_brightness">يورۇقلۇق</string> - <string name="gamma_tuning_saturation">تويۇنۇش</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">نەغمە ئەپنى قوزغات</string> <string name="headset_connect_player_summary">تىڭشىغۇچ قىستۇرۇلغاندا كۆڭۈلدىكى نەغمە چالىدىغان ئەپنى قوزغىتىدۇ</string> diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml index 5ab0966..6f2520b 100644 --- a/res/values-uk/cm_strings.xml +++ b/res/values-uk/cm_strings.xml @@ -524,14 +524,7 @@ <string name="color_red_title">Червоний</string> <string name="color_green_title">Зелений</string> <string name="color_blue_title">Синій</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Калібрування гамми</string> - <string name="gamma_tuning_summary_head">Налаштуйте параметри гамми</string> - <string name="gamma_tuning_control_set_header">Група <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Контраст</string> - <string name="gamma_tuning_brightness">Яскравість</string> - <string name="gamma_tuning_saturation">Насиченість</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Запуск програвача</string> <string name="headset_connect_player_summary">Запускати програвач при під’єднанні навушників</string> diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-ur-rPK/cm_strings.xml +++ b/res/values-ur-rPK/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-uz-rUZ/cm_strings.xml +++ b/res/values-uz-rUZ/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml index 864fc1a..88e3145 100644 --- a/res/values-vi/cm_strings.xml +++ b/res/values-vi/cm_strings.xml @@ -537,14 +537,7 @@ <string name="color_red_title">Đỏ</string> <string name="color_green_title">Xanh lá</string> <string name="color_blue_title">Xanh dương</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Hiệu chuẩn gamma</string> - <string name="gamma_tuning_summary_head">Tinh chỉnh giá trị gamma</string> - <string name="gamma_tuning_control_set_header">Nhóm <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Độ tương phản</string> - <string name="gamma_tuning_brightness">Độ sáng</string> - <string name="gamma_tuning_saturation">Độ bão hòa</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Khởi động ứng dụng nghe nhạc</string> <string name="headset_connect_player_summary">Khởi động ứng dụng nghe nhạc mặc định khi cắm tai nghe</string> diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml index 76fbc60..d25ad3e 100644 --- a/res/values-zh-rCN/cm_strings.xml +++ b/res/values-zh-rCN/cm_strings.xml @@ -536,14 +536,7 @@ <string name="color_red_title">红</string> <string name="color_green_title">绿</string> <string name="color_blue_title">蓝</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">伽玛校准</string> - <string name="gamma_tuning_summary_head">调整伽玛值</string> - <string name="gamma_tuning_control_set_header">组 <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">对比度</string> - <string name="gamma_tuning_brightness">亮度</string> - <string name="gamma_tuning_saturation">饱和度</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">启动音乐播放器</string> <string name="headset_connect_player_summary">插入耳机时启动默认音乐播放器</string> diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml index 055dc9f..d765b05 100644 --- a/res/values-zh-rHK/cm_strings.xml +++ b/res/values-zh-rHK/cm_strings.xml @@ -445,14 +445,7 @@ <string name="color_red_title">紅色</string> <string name="color_green_title">綠色</string> <string name="color_blue_title">藍色</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">伽瑪校準</string> - <string name="gamma_tuning_summary_head">調校伽瑪值</string> - <string name="gamma_tuning_control_set_header"><xliff:g id="index">%d</xliff:g>群組</string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">對比度</string> - <string name="gamma_tuning_brightness">亮度</string> - <string name="gamma_tuning_saturation">飽和度</string> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> <string name="wifi_auto_config_priorities">自動優先順序</string> diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml index 19b7fdc..6877eb2 100644 --- a/res/values-zh-rTW/cm_strings.xml +++ b/res/values-zh-rTW/cm_strings.xml @@ -481,14 +481,7 @@ <string name="color_red_title">紅色</string> <string name="color_green_title">綠色</string> <string name="color_blue_title">藍色</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">伽瑪校準</string> - <string name="gamma_tuning_summary_head">調校伽瑪值</string> - <string name="gamma_tuning_control_set_header"><xliff:g id="index">%d</xliff:g>群組</string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">對比度</string> - <string name="gamma_tuning_brightness">亮度</string> - <string name="gamma_tuning_saturation">飽和度</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">啟動音樂應用程式</string> <string name="headset_connect_player_summary">插入耳機時啟動預設音樂應用程式</string> diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml index 82cf3b1..786c346 100644 --- a/res/values-zu/cm_strings.xml +++ b/res/values-zu/cm_strings.xml @@ -88,7 +88,6 @@ <!-- Volume settings - Volume adjustment sound --> <!-- Hardware tunables - Vibrator intensity --> <!-- Hardware tunables - Color calibration --> - <!-- Hardware tunables - Gamma calibration --> <!-- used if no name provided by overlay --> <!-- Launch music player when headset is connected --> <!-- WiFi auto-configure priorities --> diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml index 830f74d..09fd23e 100644 --- a/res/values/cm_arrays.xml +++ b/res/values/cm_arrays.xml @@ -376,11 +376,6 @@ <item>silent</item> </string-array> - <!-- Gamma calibration descriptors, deliberately empty as string values populated via - per-device overlay. Required to build on non-hardware tunable devices --> - <string-array name="gamma_descriptors" translatable="false"> - </string-array> - <!-- Values for screen color --> <string-array name="screen_color_setting"> <item>Standard</item> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 906f19d..ae97862 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -618,13 +618,6 @@ <string name="color_green_title">Green</string> <string name="color_blue_title">Blue</string> - <!-- Hardware tunables - Gamma calibration --> - <string name="gamma_tuning_title_head">Gamma calibration</string> - <string name="gamma_tuning_summary_head">Tweak gamma values</string> - <string name="gamma_tuning_control_set_header">Group <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay --> - <string name="gamma_tuning_contrast">Contrast</string> - <string name="gamma_tuning_brightness">Brightness</string> - <string name="gamma_tuning_saturation">Saturation</string> <!-- Launch music player when headset is connected --> <string name="headset_connect_player_title">Launch music app</string> diff --git a/res/xml/livedisplay.xml b/res/xml/livedisplay.xml index 141fc68..ad63ebb 100644 --- a/res/xml/livedisplay.xml +++ b/res/xml/livedisplay.xml @@ -71,13 +71,6 @@ android:summary="@string/color_calibration_summary" android:persistent="false"/> - <com.android.settings.livedisplay.DisplayGamma - android:key="gamma_tuning" - android:title="@string/gamma_tuning_title_head" - android:dialogTitle="@string/gamma_tuning_title_head" - android:summary="@string/gamma_tuning_summary_head" - android:persistent="false"/> - <!-- Adaptive backlight --> <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference android:key="display_low_power" diff --git a/src/com/android/settings/cyanogenmod/BootReceiver.java b/src/com/android/settings/cyanogenmod/BootReceiver.java index 19c2794..7bee75c 100644 --- a/src/com/android/settings/cyanogenmod/BootReceiver.java +++ b/src/com/android/settings/cyanogenmod/BootReceiver.java @@ -28,7 +28,6 @@ import com.android.settings.Utils; import com.android.settings.contributors.ContributorsCloudFragment; import com.android.settings.hardware.VibratorIntensity; import com.android.settings.inputmethod.InputMethodAndLanguageSettings; -import com.android.settings.livedisplay.DisplayGamma; import com.android.settings.location.LocationSettings; import com.android.settings.DevelopmentSettings; @@ -42,7 +41,6 @@ public class BootReceiver extends BroadcastReceiver { if (!hasRestoredTunable(ctx)) { /* Restore the hardware tunable values */ ButtonSettings.restoreKeyDisabler(ctx); - DisplayGamma.restore(ctx); VibratorIntensity.restore(ctx); InputMethodAndLanguageSettings.restore(ctx); setRestoredTunable(ctx); diff --git a/src/com/android/settings/livedisplay/DisplayColor.java b/src/com/android/settings/livedisplay/DisplayColor.java index 5db508f..f6fee82 100644 --- a/src/com/android/settings/livedisplay/DisplayColor.java +++ b/src/com/android/settings/livedisplay/DisplayColor.java @@ -16,17 +16,13 @@ package com.android.settings.livedisplay; -import static cyanogenmod.hardware.CMHardwareManager.FEATURE_DISPLAY_COLOR_CALIBRATION; - import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.os.UserHandle; import android.preference.DialogPreference; -import android.provider.Settings; import android.util.AttributeSet; import android.view.View; import android.widget.Button; @@ -36,8 +32,7 @@ import android.widget.TextView; import com.android.settings.IntervalSeekBar; import com.android.settings.R; -import cyanogenmod.hardware.CMHardwareManager; -import cyanogenmod.providers.CMSettings; +import cyanogenmod.hardware.LiveDisplayManager; /** * Special preference type that allows configuration of Color settings @@ -46,11 +41,7 @@ public class DisplayColor extends DialogPreference { private static final String TAG = "ColorCalibration"; private final Context mContext; - - private final int minRGB; - private final int maxRGB; - private final float defaultRGB; - private final boolean useCMHW; + private final LiveDisplayManager mLiveDisplay; // These arrays must all match in length and order private static final int[] SEEKBAR_ID = new int[] { @@ -74,19 +65,7 @@ public class DisplayColor extends DialogPreference { super(context, attrs); mContext = context; - - final CMHardwareManager mHardware = CMHardwareManager.getInstance(context); - useCMHW = mHardware.isSupported(FEATURE_DISPLAY_COLOR_CALIBRATION); - if (useCMHW) { - minRGB = mHardware.getDisplayColorCalibrationMin(); - maxRGB = mHardware.getDisplayColorCalibrationMax(); - defaultRGB = (float) mHardware.getDisplayColorCalibrationDefault() / maxRGB; - } else { - // Initialize these just to avoid compiler errors. - minRGB = 20; - maxRGB = 100; - defaultRGB = 1.0f; - } + mLiveDisplay = LiveDisplayManager.getInstance(mContext); setDialogLayoutResource(R.layout.display_color_calibration); } @@ -105,38 +84,16 @@ public class DisplayColor extends DialogPreference { protected void onBindDialogView(View view) { super.onBindDialogView(view); - 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[] { Float.toString(defaultRGB), - Float.toString(defaultRGB), Float.toString(defaultRGB) }; - } - try { - mOriginalColors[0] = Float.parseFloat(colorAdjustment[0]); - mOriginalColors[1] = Float.parseFloat(colorAdjustment[1]); - mOriginalColors[2] = Float.parseFloat(colorAdjustment[2]); - } catch (NumberFormatException e) { - mOriginalColors[0] = defaultRGB; - mOriginalColors[1] = defaultRGB; - mOriginalColors[2] = defaultRGB; - } - + System.arraycopy(mLiveDisplay.getColorAdjustment(), 0, mOriginalColors, 0, 3); System.arraycopy(mOriginalColors, 0, mCurrentColors, 0, 3); for (int i = 0; i < SEEKBAR_ID.length; i++) { IntervalSeekBar seekBar = (IntervalSeekBar) view.findViewById(SEEKBAR_ID[i]); TextView value = (TextView) view.findViewById(SEEKBAR_VALUE_ID[i]); mSeekBars[i] = new ColorSeekBar(seekBar, value, i); - if (useCMHW) { - mSeekBars[i].mSeekBar.setMinimum((float) minRGB / maxRGB); - /* Maximum hasn't changed but it's relative to the minimum so it needs - to be reset */ - mSeekBars[i].mSeekBar.setMaximum(1.0f); - } + mSeekBars[i].mSeekBar.setMinimum(0.1f); + mSeekBars[i].mSeekBar.setMaximum(1.0f); + mSeekBars[i].mSeekBar.setProgressFloat(mCurrentColors[i]); int percent = Math.round(100F * mCurrentColors[i]); value.setText(String.format("%d%%", percent)); @@ -155,8 +112,8 @@ public class DisplayColor extends DialogPreference { @Override public void onClick(View v) { for (int i = 0; i < mSeekBars.length; i++) { - mSeekBars[i].mSeekBar.setProgressFloat(defaultRGB); - mCurrentColors[i] = defaultRGB; + mSeekBars[i].mSeekBar.setProgressFloat(1.0f); + mCurrentColors[i] = 1.0f; } updateColors(mCurrentColors); } @@ -241,12 +198,7 @@ public class DisplayColor extends DialogPreference { } private void updateColors(float[] colors) { - CMSettings.System.putStringForUser(mContext.getContentResolver(), - CMSettings.System.DISPLAY_COLOR_ADJUSTMENT, - new StringBuilder().append(colors[0]).append(" ") - .append(colors[1]).append(" ") - .append(colors[2]).toString(), - UserHandle.USER_CURRENT); + mLiveDisplay.setColorAdjustment(colors); } private class ColorSeekBar implements SeekBar.OnSeekBarChangeListener { diff --git a/src/com/android/settings/livedisplay/DisplayGamma.java b/src/com/android/settings/livedisplay/DisplayGamma.java deleted file mode 100644 index 2b44cea..0000000 --- a/src/com/android/settings/livedisplay/DisplayGamma.java +++ /dev/null @@ -1,383 +0,0 @@ -/* - * Copyright (C) 2013-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.settings.livedisplay; - -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; -import android.content.res.Resources; -import android.os.Bundle; -import android.os.Parcel; -import android.os.Parcelable; -import android.preference.DialogPreference; -import android.preference.PreferenceManager; -import android.text.TextUtils; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Button; -import android.widget.SeekBar; -import android.widget.TextView; - -import com.android.settings.R; - -import cyanogenmod.hardware.CMHardwareManager; -import cyanogenmod.providers.CMSettings; - -import java.util.ArrayList; -import java.util.Arrays; - -/** - * Special preference type that allows configuration of Gamma settings - */ -public class DisplayGamma extends DialogPreference { - private static final String TAG = "GammaCalibration"; - - private static final int[] BAR_COLORS = new int[] { - R.string.color_red_title, - R.string.color_green_title, - R.string.color_blue_title - }; - - private GammaSeekBar[][] mSeekBars; - - private int[][] mCurrentColors; - private int[][] mOriginalColors; - private int mNumberOfControls; - private CMHardwareManager mHardware; - - public DisplayGamma(Context context, AttributeSet attrs) { - super(context, attrs); - - mHardware = CMHardwareManager.getInstance(context); - if (!mHardware.isSupported(CMHardwareManager.FEATURE_DISPLAY_GAMMA_CALIBRATION)) { - return; - } - - mNumberOfControls = mHardware.getNumGammaControls(); - mSeekBars = new GammaSeekBar[mNumberOfControls][BAR_COLORS.length]; - - mOriginalColors = new int[mNumberOfControls][]; - mCurrentColors = new int[mNumberOfControls][]; - - setDialogLayoutResource(R.layout.display_gamma_calibration); - } - - @Override - protected void onPrepareDialogBuilder(AlertDialog.Builder builder) { - builder.setNeutralButton(R.string.settings_reset_button, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - } - }); - } - - @Override - protected void onBindDialogView(View view) { - super.onBindDialogView(view); - - final ViewGroup container = (ViewGroup) view.findViewById(R.id.gamma_container); - final LayoutInflater inflater = LayoutInflater.from(getContext()); - final SharedPreferences prefs = getSharedPreferences(); - final Resources res = container.getResources(); - final String[] gammaDescriptors = res.getStringArray(R.array.gamma_descriptors); - - // Create multiple sets of seekbars, depending on the - // number of controls the device has - for (int index = 0; index < mNumberOfControls; index++) { - mOriginalColors[index] = mHardware.getDisplayGammaCalibration(index); - mCurrentColors[index] = Arrays.copyOf(mOriginalColors[index], - mOriginalColors[index].length); - - final String defaultKey = "display_gamma_default_" + index; - if (!prefs.contains(defaultKey)) { - prefs.edit() - .putString(defaultKey, buildPreferenceValue(mOriginalColors[index])) - .apply(); - } - - if (mNumberOfControls != 1) { - TextView header = (TextView) inflater.inflate( - R.layout.display_gamma_calibration_header, container, false); - - if (index < gammaDescriptors.length) { - header.setText(gammaDescriptors[index]); - } else { - header.setText(res.getString( - R.string.gamma_tuning_control_set_header, index + 1)); - } - container.addView(header); - } - - int min = mHardware.getDisplayGammaCalibrationMin(); - int max = mHardware.getDisplayGammaCalibrationMax(); - for (int color = 0; color < BAR_COLORS.length; color++) { - ViewGroup item = (ViewGroup) inflater.inflate( - R.layout.display_gamma_calibration_item, container, false); - - mSeekBars[index][color] = new GammaSeekBar(index, color, item, min, max); - mSeekBars[index][color].setGamma(mCurrentColors[index][color]); - // make sure to add the seekbar group to the container _after_ - // creating GammaSeekBar, so that GammaSeekBar has a chance to - // get the correct subviews without getting confused by duplicate IDs - container.addView(item); - } - } - } - - @Override - protected void showDialog(Bundle state) { - super.showDialog(state); - - // can't use onPrepareDialogBuilder for this as we want the dialog - // to be kept open on click - AlertDialog d = (AlertDialog) getDialog(); - Button defaultsButton = d.getButton(DialogInterface.BUTTON_NEUTRAL); - defaultsButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - for (int index = 0; index < mSeekBars.length; index++) { - final SharedPreferences prefs = getSharedPreferences(); - final String defaultKey = "display_gamma_default_" + index; - // this key is guaranteed to be present, as we have - // created it in onBindDialogView() - final String value = prefs.getString(defaultKey, null); - final String[] defaultColors = value.split(" "); - - for (int color = 0; color < BAR_COLORS.length; color++) { - int val = Integer.valueOf(defaultColors[color]); - mSeekBars[index][color].setGamma(val); - mCurrentColors[index][color] = val; - } - writeDisplayGamma(getContext(), index, mCurrentColors[index]); - } - } - }); - } - - @Override - protected void onDialogClosed(boolean positiveResult) { - super.onDialogClosed(positiveResult); - - if (positiveResult) { - Editor editor = getEditor(); - for (int i = 0; i < mNumberOfControls; i++) { - editor.putString("display_gamma_" + i, - buildPreferenceValue(mHardware.getDisplayGammaCalibration(i))); - } - editor.apply(); - } else if (mOriginalColors != null) { - for (int i = 0; i < mNumberOfControls; i++) { - writeDisplayGamma(getContext(), i, mOriginalColors[i]); - } - } - } - - @Override - protected Parcelable onSaveInstanceState() { - final Parcelable superState = super.onSaveInstanceState(); - if (getDialog() == null || !getDialog().isShowing()) { - return superState; - } - - // Save the dialog state - final SavedState myState = new SavedState(superState); - myState.controlCount = mNumberOfControls; - myState.currentColors = mCurrentColors; - myState.originalColors = mOriginalColors; - - // Restore the old state when the activity or dialog is being paused - for (int i = 0; i < mNumberOfControls; i++) { - writeDisplayGamma(getContext(), i, mOriginalColors[i]); - } - mOriginalColors = null; - - return myState; - } - - @Override - protected void onRestoreInstanceState(Parcelable state) { - if (state == null || !state.getClass().equals(SavedState.class)) { - // Didn't save state for us in onSaveInstanceState - super.onRestoreInstanceState(state); - return; - } - - SavedState myState = (SavedState) state; - super.onRestoreInstanceState(myState.getSuperState()); - mNumberOfControls = myState.controlCount; - mOriginalColors = myState.originalColors; - mCurrentColors = myState.currentColors; - - for (int index = 0; index < mNumberOfControls; index++) { - for (int color = 0; color < BAR_COLORS.length; color++) { - mSeekBars[index][color].setGamma(mCurrentColors[index][color]); - } - writeDisplayGamma(getContext(), index, mCurrentColors[index]); - } - } - - private String buildPreferenceValue(int[] colorValues) { - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < colorValues.length; i++) { - if (i != 0) { - builder.append(" "); - } - builder.append(colorValues[i]); - } - return builder.toString(); - } - - public static void restore(Context context) { - final CMHardwareManager hardware = CMHardwareManager.getInstance(context); - if (!hardware.isSupported(CMHardwareManager.FEATURE_DISPLAY_GAMMA_CALIBRATION)) { - return; - } - - final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - int[] rgb = new int[3]; - for (int i = 0; i < hardware.getNumGammaControls(); i++) { - final String value = prefs.getString("display_gamma_" + i, null); - if (value != null) { - final String[] values = value.split(" "); - rgb[0] = Integer.valueOf(values[0]); - rgb[1] = Integer.valueOf(values[1]); - rgb[2] = Integer.valueOf(values[2]); - writeDisplayGamma(context, i, rgb); - } - } - } - - private static class SavedState extends BaseSavedState { - int controlCount; - int[][] originalColors; - int[][] currentColors; - - public SavedState(Parcelable superState) { - super(superState); - } - - public SavedState(Parcel source) { - super(source); - controlCount = source.readInt(); - originalColors = new int[controlCount][]; - currentColors = new int[controlCount][]; - for (int i = 0; i < controlCount; i++) { - originalColors[i] = source.createIntArray(); - } - for (int i = 0; i < controlCount; i++) { - currentColors[i] = source.createIntArray(); - } - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - super.writeToParcel(dest, flags); - dest.writeInt(controlCount); - for (int i = 0; i < controlCount; i++) { - dest.writeIntArray(originalColors[i]); - } - for (int i = 0; i < controlCount; i++) { - dest.writeIntArray(currentColors[i]); - } - } - - public static final Parcelable.Creator<SavedState> CREATOR = - new Parcelable.Creator<SavedState>() { - - public SavedState createFromParcel(Parcel in) { - return new SavedState(in); - } - - public SavedState[] newArray(int size) { - return new SavedState[size]; - } - }; - } - - private static void writeDisplayGamma(Context context, int index, int[] entries) { - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < entries.length; i++) { - builder.append(i); - if (i != entries.length - 1) { - builder.append("|"); - } - } - CMSettings.Secure.putString(context.getContentResolver(), - CMSettings.Secure.DISPLAY_GAMMA_CALIBRATION_PREFIX + index, - builder.toString()); - } - - private class GammaSeekBar implements SeekBar.OnSeekBarChangeListener { - private int mControlIndex; - private int mColorIndex; - private int mOriginal; - private int mMin; - private int mMax; - private SeekBar mSeekBar; - private TextView mValue; - - public GammaSeekBar(int controlIndex, int colorIndex, ViewGroup container, - int min, int max) { - mControlIndex = controlIndex; - mColorIndex = colorIndex; - - mMin = min; - mMax = max; - - mValue = (TextView) container.findViewById(R.id.color_value); - mSeekBar = (SeekBar) container.findViewById(R.id.color_seekbar); - - TextView label = (TextView) container.findViewById(R.id.color_text); - label.setText(container.getContext().getString(BAR_COLORS[colorIndex])); - - mSeekBar.setMax(mMax - mMin); - mSeekBar.setProgress(0); - mValue.setText(String.valueOf(mSeekBar.getProgress() + mMin)); - - // this must be done last, we don't want to apply our initial value to the hardware - mSeekBar.setOnSeekBarChangeListener(this); - } - - public void setGamma(int gamma) { - mSeekBar.setProgress(gamma - mMin); - } - - @Override - public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { - if (fromUser) { - mCurrentColors[mControlIndex][mColorIndex] = progress + mMin; - writeDisplayGamma(getContext(), mControlIndex, mCurrentColors[mControlIndex]); - } - mValue.setText(String.valueOf(progress + mMin)); - } - - @Override - public void onStartTrackingTouch(SeekBar seekBar) { - // Do nothing - } - - @Override - public void onStopTrackingTouch(SeekBar seekBar) { - // Do nothing - } - } -} diff --git a/src/com/android/settings/livedisplay/DisplayTemperature.java b/src/com/android/settings/livedisplay/DisplayTemperature.java index 24ca747..f63204b 100644 --- a/src/com/android/settings/livedisplay/DisplayTemperature.java +++ b/src/com/android/settings/livedisplay/DisplayTemperature.java @@ -22,9 +22,7 @@ import android.content.DialogInterface; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.os.UserHandle; import android.preference.DialogPreference; -import android.provider.Settings; import android.util.AttributeSet; import android.view.View; import android.widget.Button; @@ -32,7 +30,9 @@ import android.widget.SeekBar; import android.widget.TextView; import com.android.settings.R; -import cyanogenmod.providers.CMSettings; + +import cyanogenmod.hardware.LiveDisplayConfig; +import cyanogenmod.hardware.LiveDisplayManager; /** * Preference for selection of color temperature range for LiveDisplay @@ -48,17 +48,14 @@ public class DisplayTemperature extends DialogPreference { private int mOriginalDayTemperature; private int mOriginalNightTemperature; - private final int mDefaultDayTemperature; - private final int mDefaultNightTemperature; + private final LiveDisplayManager mLiveDisplay; + private final LiveDisplayConfig mConfig; public DisplayTemperature(Context context, AttributeSet attrs) { super(context, attrs); mContext = context; - - mDefaultDayTemperature = mContext.getResources().getInteger( - org.cyanogenmod.platform.internal.R.integer.config_dayColorTemperature); - mDefaultNightTemperature = mContext.getResources().getInteger( - org.cyanogenmod.platform.internal.R.integer.config_nightColorTemperature); + mLiveDisplay = LiveDisplayManager.getInstance(mContext); + mConfig = mLiveDisplay.getConfig(); setDialogLayoutResource(R.layout.display_temperature); } @@ -77,14 +74,8 @@ public class DisplayTemperature extends DialogPreference { protected void onBindDialogView(View view) { super.onBindDialogView(view); - mOriginalDayTemperature = CMSettings.System.getIntForUser(mContext.getContentResolver(), - CMSettings.System.DISPLAY_TEMPERATURE_DAY, - mDefaultDayTemperature, - UserHandle.USER_CURRENT); - mOriginalNightTemperature = CMSettings.System.getIntForUser(mContext.getContentResolver(), - CMSettings.System.DISPLAY_TEMPERATURE_NIGHT, - mDefaultNightTemperature, - UserHandle.USER_CURRENT); + mOriginalDayTemperature = mLiveDisplay.getDayColorTemperature(); + mOriginalNightTemperature = mLiveDisplay.getNightColorTemperature(); SeekBar day = (SeekBar) view.findViewById(R.id.day_temperature_seekbar); TextView dayText = (TextView) view.findViewById(R.id.day_temperature_value); @@ -109,8 +100,8 @@ public class DisplayTemperature extends DialogPreference { defaultsButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - mDayTemperature.setProgress(mDefaultDayTemperature); - mNightTemperature.setProgress(mDefaultNightTemperature); + mDayTemperature.setProgress(mConfig.getDefaultDayTemperature()); + mNightTemperature.setProgress(mConfig.getDefaultNightTemperature()); updateTemperature(true); } }); @@ -206,13 +197,8 @@ public class DisplayTemperature extends DialogPreference { int night = accept ? mNightTemperature.getProgress() : mOriginalNightTemperature; callChangeListener(new Integer[] { day, night }); - CMSettings.System.putIntForUser(mContext.getContentResolver(), - CMSettings.System.DISPLAY_TEMPERATURE_DAY, day, - UserHandle.USER_CURRENT); - - CMSettings.System.putIntForUser(mContext.getContentResolver(), - CMSettings.System.DISPLAY_TEMPERATURE_NIGHT, night, - UserHandle.USER_CURRENT); + mLiveDisplay.setDayColorTemperature(day); + mLiveDisplay.setNightColorTemperature(night); } private class ColorTemperatureSeekBar implements SeekBar.OnSeekBarChangeListener { diff --git a/src/com/android/settings/livedisplay/LiveDisplay.java b/src/com/android/settings/livedisplay/LiveDisplay.java index 7000cc8..5cb7aff 100644 --- a/src/com/android/settings/livedisplay/LiveDisplay.java +++ b/src/com/android/settings/livedisplay/LiveDisplay.java @@ -15,20 +15,17 @@ */ package com.android.settings.livedisplay; -import static cyanogenmod.hardware.CMHardwareManager.FEATURE_ADAPTIVE_BACKLIGHT; -import static cyanogenmod.hardware.CMHardwareManager.FEATURE_COLOR_ENHANCEMENT; -import static cyanogenmod.hardware.CMHardwareManager.FEATURE_DISPLAY_MODES; -import static cyanogenmod.hardware.CMHardwareManager.FEATURE_DISPLAY_GAMMA_CALIBRATION; -import static cyanogenmod.hardware.CMHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT; +import static cyanogenmod.hardware.LiveDisplayManager.FEATURE_CABC; +import static cyanogenmod.hardware.LiveDisplayManager.FEATURE_COLOR_ENHANCEMENT; +import static cyanogenmod.hardware.LiveDisplayManager.FEATURE_DISPLAY_MODES; +import static cyanogenmod.hardware.LiveDisplayManager.MODE_OFF; +import static cyanogenmod.hardware.LiveDisplayManager.MODE_OUTDOOR; -import android.app.Activity; -import android.database.ContentObserver; import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; import android.database.ContentObserver; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; @@ -38,7 +35,6 @@ import android.preference.PreferenceCategory; import android.preference.PreferenceScreen; import android.preference.SwitchPreference; import android.provider.SearchIndexableResource; -import android.provider.Settings; import android.util.Log; import com.android.internal.util.ArrayUtils; @@ -48,14 +44,17 @@ import com.android.settings.Utils; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; -import cyanogenmod.hardware.CMHardwareManager; -import cyanogenmod.hardware.DisplayMode; -import cyanogenmod.providers.CMSettings; import org.cyanogenmod.internal.logging.CMMetricsLogger; import java.util.ArrayList; import java.util.List; +import cyanogenmod.hardware.CMHardwareManager; +import cyanogenmod.hardware.DisplayMode; +import cyanogenmod.hardware.LiveDisplayConfig; +import cyanogenmod.hardware.LiveDisplayManager; +import cyanogenmod.providers.CMSettings; + public class LiveDisplay extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener, Indexable { @@ -72,17 +71,10 @@ public class LiveDisplay extends SettingsPreferenceFragment implements private static final String KEY_LIVE_DISPLAY_TEMPERATURE = "live_display_color_temperature"; private static final String KEY_DISPLAY_COLOR = "color_calibration"; - private static final String KEY_DISPLAY_GAMMA = "gamma_tuning"; private static final String KEY_SCREEN_COLOR_SETTINGS = "screencolor_settings"; private static final String KEY_LIVE_DISPLAY_COLOR_PROFILE = "live_display_color_profile"; - 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 final Handler mHandler = new Handler(); private final SettingsObserver mObserver = new SettingsObserver(); @@ -102,26 +94,21 @@ public class LiveDisplay extends SettingsPreferenceFragment implements private String[] mModeValues; private String[] mModeSummaries; - private int mDefaultDayTemperature; - private int mDefaultNightTemperature; - private boolean mHasDisplayModes = false; + private LiveDisplayManager mLiveDisplayManager; + private LiveDisplayConfig mConfig; + private CMHardwareManager mHardware; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - final Activity activity = getActivity(); - final ContentResolver resolver = activity.getContentResolver(); final Resources res = getResources(); - mDefaultDayTemperature = res.getInteger( - org.cyanogenmod.platform.internal.R.integer.config_dayColorTemperature); - mDefaultNightTemperature = res.getInteger( - org.cyanogenmod.platform.internal.R.integer.config_nightColorTemperature); - - mHardware = CMHardwareManager.getInstance(activity); + mHardware = CMHardwareManager.getInstance(getActivity()); + mLiveDisplayManager = LiveDisplayManager.getInstance(getActivity()); + mConfig = mLiveDisplayManager.getConfig(); addPreferencesFromResource(R.xml.livedisplay); @@ -130,9 +117,8 @@ public class LiveDisplay extends SettingsPreferenceFragment implements PreferenceCategory advancedPrefs = (PreferenceCategory) findPreference(KEY_CATEGORY_ADVANCED); - int adaptiveMode = CMSettings.System.getIntForUser(resolver, - CMSettings.System.DISPLAY_TEMPERATURE_MODE, - 0, UserHandle.USER_CURRENT); + int adaptiveMode = mLiveDisplayManager.getMode(); + mLiveDisplay = (ListPreference) findPreference(KEY_LIVE_DISPLAY); mLiveDisplay.setValue(String.valueOf(adaptiveMode)); @@ -144,7 +130,7 @@ public class LiveDisplay extends SettingsPreferenceFragment implements org.cyanogenmod.platform.internal.R.array.live_display_summaries); // Remove outdoor mode from lists if there is no support - if (!mHardware.isSupported(FEATURE_SUNLIGHT_ENHANCEMENT)) { + if (!mConfig.hasFeature(LiveDisplayManager.MODE_OUTDOOR)) { int idx = ArrayUtils.indexOf(mModeValues, String.valueOf(MODE_OUTDOOR)); String[] entriesTemp = new String[mModeEntries.length - 1]; String[] valuesTemp = new String[mModeValues.length - 1]; @@ -172,7 +158,7 @@ public class LiveDisplay extends SettingsPreferenceFragment implements mColorProfile = (ListPreference) findPreference(KEY_LIVE_DISPLAY_COLOR_PROFILE); if (liveDisplayPrefs != null && mColorProfile != null - && (!mHardware.isSupported(FEATURE_DISPLAY_MODES) || !updateDisplayModes())) { + && (!mConfig.hasFeature(FEATURE_DISPLAY_MODES) || !updateDisplayModes())) { liveDisplayPrefs.removePreference(mColorProfile); } else { mHasDisplayModes = true; @@ -181,33 +167,25 @@ public class LiveDisplay extends SettingsPreferenceFragment implements mOutdoorMode = (SwitchPreference) findPreference(KEY_LIVE_DISPLAY_AUTO_OUTDOOR_MODE); if (liveDisplayPrefs != null && mOutdoorMode != null - && !mHardware.isSupported(FEATURE_SUNLIGHT_ENHANCEMENT)) { + && !mConfig.hasFeature(MODE_OUTDOOR)) { liveDisplayPrefs.removePreference(mOutdoorMode); mOutdoorMode = null; } mLowPower = (SwitchPreference) findPreference(KEY_LIVE_DISPLAY_LOW_POWER); if (advancedPrefs != null && mLowPower != null - && !mHardware.isSupported(FEATURE_ADAPTIVE_BACKLIGHT)) { + && !mConfig.hasFeature(FEATURE_CABC)) { advancedPrefs.removePreference(mLowPower); mLowPower = null; } mColorEnhancement = (SwitchPreference) findPreference(KEY_LIVE_DISPLAY_COLOR_ENHANCE); if (advancedPrefs != null && mColorEnhancement != null - && !mHardware.isSupported(FEATURE_COLOR_ENHANCEMENT)) { + && !mConfig.hasFeature(FEATURE_COLOR_ENHANCEMENT)) { advancedPrefs.removePreference(mColorEnhancement); mColorEnhancement = null; } - if (advancedPrefs != null - && !mHardware.isSupported(FEATURE_DISPLAY_GAMMA_CALIBRATION)) { - Preference gammaPref = findPreference(KEY_DISPLAY_GAMMA); - if (gammaPref != null) { - advancedPrefs.removePreference(gammaPref); - } - } - mScreenColorSettings = (PreferenceScreen) findPreference(KEY_SCREEN_COLOR_SETTINGS); if (advancedPrefs != null) { if (mScreenColorSettings != null && @@ -310,9 +288,7 @@ public class LiveDisplay extends SettingsPreferenceFragment implements } private void updateModeSummary() { - int mode = CMSettings.System.getIntForUser(getContentResolver(), - CMSettings.System.DISPLAY_TEMPERATURE_MODE, - MODE_OFF, UserHandle.USER_CURRENT); + int mode = mLiveDisplayManager.getMode(); int index = ArrayUtils.indexOf(mModeValues, String.valueOf(mode)); if (index < 0) { @@ -331,14 +307,8 @@ public class LiveDisplay extends SettingsPreferenceFragment implements } private void updateTemperatureSummary() { - int day = CMSettings.System.getIntForUser(getContentResolver(), - CMSettings.System.DISPLAY_TEMPERATURE_DAY, - mDefaultDayTemperature, - UserHandle.USER_CURRENT); - int night = CMSettings.System.getIntForUser(getContentResolver(), - CMSettings.System.DISPLAY_TEMPERATURE_NIGHT, - mDefaultNightTemperature, - UserHandle.USER_CURRENT); + int day = mLiveDisplayManager.getDayColorTemperature(); + int night = mLiveDisplayManager.getNightColorTemperature(); mDisplayTemperature.setSummary(getResources().getString( R.string.live_display_color_temperature_summary, day, night)); @@ -347,9 +317,7 @@ public class LiveDisplay extends SettingsPreferenceFragment implements @Override public boolean onPreferenceChange(Preference preference, Object objValue) { if (preference == mLiveDisplay) { - CMSettings.System.putIntForUser(getContentResolver(), - CMSettings.System.DISPLAY_TEMPERATURE_MODE, - Integer.valueOf((String)objValue), UserHandle.USER_CURRENT); + mLiveDisplayManager.setMode(Integer.valueOf((String)objValue)); } else if (preference == mColorProfile) { int id = Integer.valueOf((String)objValue); Log.i("LiveDisplay", "Setting mode: " + id); @@ -401,8 +369,6 @@ public class LiveDisplay extends SettingsPreferenceFragment implements public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { - private boolean mHasSunlightEnhancement, mHasColorEnhancement, mHasLowPower; - private boolean mHasDisplayGamma; @Override public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, @@ -419,19 +385,20 @@ public class LiveDisplay extends SettingsPreferenceFragment implements @Override public List<String> getNonIndexableKeys(Context context) { - CMHardwareManager hardware = CMHardwareManager.getInstance(context); + final CMHardwareManager hardware = CMHardwareManager.getInstance(context); + final LiveDisplayConfig config = LiveDisplayManager.getInstance(context).getConfig(); ArrayList<String> result = new ArrayList<String>(); if (!hardware.isSupported(FEATURE_DISPLAY_MODES)) { result.add(KEY_LIVE_DISPLAY_COLOR_PROFILE); } - if (!hardware.isSupported(FEATURE_SUNLIGHT_ENHANCEMENT)) { + if (!config.hasFeature(MODE_OUTDOOR)) { result.add(KEY_LIVE_DISPLAY_AUTO_OUTDOOR_MODE); } - if (!hardware.isSupported(FEATURE_COLOR_ENHANCEMENT)) { + if (!config.hasFeature(FEATURE_COLOR_ENHANCEMENT)) { result.add(KEY_LIVE_DISPLAY_COLOR_ENHANCE); } - if (!hardware.isSupported(FEATURE_ADAPTIVE_BACKLIGHT)) { + if (!config.hasFeature(FEATURE_CABC)) { result.add(KEY_LIVE_DISPLAY_LOW_POWER); } if (!isPostProcessingSupported(context)) { @@ -439,9 +406,6 @@ public class LiveDisplay extends SettingsPreferenceFragment implements } else { result.add(KEY_DISPLAY_COLOR); } - if (!hardware.isSupported(FEATURE_DISPLAY_GAMMA_CALIBRATION)) { - result.add(KEY_DISPLAY_GAMMA); - } return result; } }; |