summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xBoardConfigCommon.mk3
-rw-r--r--CrespoParts/res/values-da/strings.xml31
-rw-r--r--CrespoParts/res/values-es/strings.xml31
-rw-r--r--CrespoParts/res/values-fr/strings.xml31
-rw-r--r--CrespoParts/res/values-ja/strings.xml31
-rw-r--r--CrespoParts/res/values-nl/strings.xml31
-rwxr-xr-xCrespoParts/res/values-pt-rBR/strings.xml2
-rw-r--r--CrespoParts/res/values-pt-rPT/strings.xml31
-rw-r--r--CrespoParts/res/values-ru/strings.xml31
-rw-r--r--CrespoParts/res/values-tr/strings.xml31
-rw-r--r--CrespoParts/res/values-zh-rCN/strings.xml11
-rw-r--r--CrespoParts/res/values-zh-rTW/strings.xml31
-rwxr-xr-xinclude/sec_lcd.h1
-rw-r--r--libhwcomposer/Android.mk4
-rw-r--r--libhwcomposer/SecHWC.cpp52
15 files changed, 62 insertions, 290 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 1bf3e27..0912389 100755
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -104,3 +104,6 @@ TARGET_DISABLE_TRIPLE_BUFFERING := false
BOARD_ALLOW_EGL_HIBERNATION := true
+# hwcomposer: custom vsync ioctl
+BOARD_CUSTOM_VSYNC_IOCTL := true
+
diff --git a/CrespoParts/res/values-da/strings.xml b/CrespoParts/res/values-da/strings.xml
index 116377b..a3c8b39 100644
--- a/CrespoParts/res/values-da/strings.xml
+++ b/CrespoParts/res/values-da/strings.xml
@@ -9,37 +9,6 @@
<string name="color_green_title">Grøn</string>
<string name="color_blue_title">Blå</string>
- <!-- WM8994 Control Settings -->
- <string name="general_sound_title">Lyd</string>
- <!-- Categories -->
- <string name="category_wm8994_internal_speaker">Intern Højtaler Indstillinger</string>
- <string name="category_wm8994_signal_processing">Signal Bearbejdning</string>
- <string name="category_wm8994_headphone_amp">Høretelefons Forstærker</string>
- <string name="category_wm8994_codec_optimization">Codec Optimering</string>
- <string name="category_wm8994_dac_config">Digital/Analog Konverterings Indstillinger</string>
- <string name="category_wm8994_analog_path">Analog Linie Konfiguration</string>
- <string name="category_wm8994_mic_settings">Microfon Indstillinger</string>
- <!-- Titles/Summaries -->
- <string name="wm8994_settings_title_head">Lyd Instillinger</string>
- <string name="wm8994_settings_title_subhead">Lyd Indstillinger</string>
- <string name="wm8994_settings_summary_head">Avanceret kontrol af WM8994 lyd bearbejdnings hardware</string>
- <string name="pref_wm8994_control_enable_title">Aktiver WM8994 Kontrol</string>
- <string name="pref_wm8994_control_enable_summary">Aktiver avanceret kontrol af WM8994 bearbejdnings hardware</string>
- <string name="pref_wm8994_speaker_tuning_title">Juster højtaler til musik</string>
- <string name="pref_wm8994_speaker_tuning_summary">Rekonfigurer hardware EQ for mere bas og balanceret lyd</string>
- <string name="pref_wm8994_mono_downmix_title">Mono downmix</string>
- <string name="pref_wm8994_mono_downmix_summary">Downmix stereo lyd til mono (for stereo outputs, så som høretelefoner)</string>
- <string name="pref_wm8994_stereo_expansion_title">Stereo ekspansion</string>
- <string name="pref_wm8994_stereo_expansion_summary">"Udvid" stereo lyd via digital signal bearbejdning</string>
- <string name="pref_wm8994_dac_direct_title">D/AC direkte</string>
- <string name="pref_wm8994_dac_direct_summary">Tilgå digital/analog konverter direkte, udenom channel mixer. Giver renere lyd (sænker signal-to-noise forholdet)</string>
- <string name="pref_wm8994_dac_osr128_title">Hi-fi afspilning</string>
- <string name="pref_wm8994_dac_osr128_summary">Digital-til-analog konverter 128x oversampling -- renere lyd når der afspilles musik</string>
- <string name="pref_wm8994_adc_osr128_title">Hi-fi optagelse</string>
- <string name="pref_wm8994_adc_osr128_summary">Analog-to-digital konverter 128x oversampling -- øger kvaliteten af optagelser</string>
- <string name="pref_wm8994_fll_tuning_title">Tuned lyd frekvens</string>
- <string name="pref_wm8994_fll_tuning_summary">Brug tuned WM8994 lyd frekvens kilde -- øger kvaliteten af lyd</string>
-
<string name="category_touchkey_title">Touch Knapper</string>
<string name="backlight_timeout_title_head">Baggrundslys Timeout</string>
<string name="backlight_timeout_summary_head">Indstil forsinkelsen for hvornår touch knappernes lys skal slukkes</string>
diff --git a/CrespoParts/res/values-es/strings.xml b/CrespoParts/res/values-es/strings.xml
index 0ba86fd..d48f7c1 100644
--- a/CrespoParts/res/values-es/strings.xml
+++ b/CrespoParts/res/values-es/strings.xml
@@ -9,37 +9,6 @@
<string name="color_green_title">Verde</string>
<string name="color_blue_title">Azul</string>
- <!-- WM8994 Control Settings -->
- <string name="general_sound_title">Sonido</string>
- <!-- Categories -->
- <string name="category_wm8994_internal_speaker">Configurar altavoz interno</string>
- <string name="category_wm8994_signal_processing">Procesado de señal</string>
- <string name="category_wm8994_headphone_amp">Configurar manoslibres</string>
- <string name="category_wm8994_codec_optimization">Optimización codec</string>
- <string name="category_wm8994_dac_config">Parámetros Digital/Analogico</string>
- <string name="category_wm8994_analog_path">Parámetros camino analógico</string>
- <string name="category_wm8994_mic_settings">Parámetros del micro</string>
- <!-- Titles/Summaries -->
- <string name="wm8994_settings_title_head">Parámetros del sonido</string>
- <string name="wm8994_settings_title_subhead">Parámetros del sonido</string>
- <string name="wm8994_settings_summary_head">Control avanzado del procesador de sonido del WM8994</string>
- <string name="pref_wm8994_control_enable_title">Habilitar control WM8994</string>
- <string name="pref_wm8994_control_enable_summary">Habilitar el control de procesador de sonido del WM8994</string>
- <string name="pref_wm8994_speaker_tuning_title">Ajustar altavoz para música</string>
- <string name="pref_wm8994_speaker_tuning_summary">Reconfigurar el EQ para tener más bajos y sonido balanceado</string>
- <string name="pref_wm8994_mono_downmix_title">Mezclador a mono</string>
- <string name="pref_wm8994_mono_downmix_summary">Degrada estereo para salir en mono (para salidas estereo, como los cascos)</string>
- <string name="pref_wm8994_stereo_expansion_title">Expansión estereo</string>
- <string name="pref_wm8994_stereo_expansion_summary">"Expande" sonido estereo via procesado digital de señal</string>
- <string name="pref_wm8994_dac_direct_title">D/AC directo</string>
- <string name="pref_wm8994_dac_direct_summary">Acceso directo al convertidor digital/analogico, inhibiendo el mezclador de canales. Produce mayor señal limpia</string>
- <string name="pref_wm8994_dac_osr128_title">Reproducción Hi-fi</string>
- <string name="pref_wm8994_dac_osr128_summary">Convertidor Digital-a-analogico 128x sobre muestreada -- sonido más claro al reproducir música</string>
- <string name="pref_wm8994_adc_osr128_title">Grabación Hi-fi</string>
- <string name="pref_wm8994_adc_osr128_summary">Convertidor Digital-a-analogico 128x sobre muestreada -- sonido más claro al grabar</string>
- <string name="pref_wm8994_fll_tuning_title">Reloj audio mejorado</string>
- <string name="pref_wm8994_fll_tuning_summary">Usar el reloj del sonido del WM8994 -- mejora la calidad del sonido</string>
-
<string name="category_touchkey_title">Teclas</string>
<string name="backlight_timeout_title_head">Tiempo de luz teclado</string>
<string name="backlight_timeout_summary_head">Adjusta el tiempo al que se desactiva la luz de las teclas con la pantalla encendida</string>
diff --git a/CrespoParts/res/values-fr/strings.xml b/CrespoParts/res/values-fr/strings.xml
index cd8df9d..600aa8c 100644
--- a/CrespoParts/res/values-fr/strings.xml
+++ b/CrespoParts/res/values-fr/strings.xml
@@ -9,37 +9,6 @@
<string name="color_green_title">Vert</string>
<string name="color_blue_title">Bleu</string>
- <!-- WM8994 Control Settings -->
- <string name="general_sound_title">Son</string>
- <!-- Categories -->
- <string name="category_wm8994_internal_speaker">Configuration Haut-Parleur Interne</string>
- <string name="category_wm8994_signal_processing">Traitement du Signal</string>
- <string name="category_wm8994_headphone_amp">Amplificateur Ecouteurs</string>
- <string name="category_wm8994_codec_optimization">Optimisation du Codec</string>
- <string name="category_wm8994_dac_config">Configuration du Convertisseur Analogique Numérique</string>
- <string name="category_wm8994_analog_path">Configuration du Chemin Analogique</string>
- <string name="category_wm8994_mic_settings">Configuration du Micro</string>
- <!-- Titles/Summaries -->
- <string name="wm8994_settings_title_head">Paramètres du Son</string>
- <string name="wm8994_settings_title_subhead">Paamètres du Son</string>
- <string name="wm8994_settings_summary_head">Contrôle Avancé du Matériel de Traitement du Son WM8994</string>
- <string name="pref_wm8994_control_enable_title">Activer le Contrôle WM8994</string>
- <string name="pref_wm8994_control_enable_summary">Activer les Contrôles Avancés du Matériel de Traitement du Son WM8994</string>
- <string name="pref_wm8994_speaker_tuning_title">Régler le Haut-Parleur pour la Musique</string>
- <string name="pref_wm8994_speaker_tuning_summary">Reconfigurer le matériel EQ pour un son plus grave et équilibré</string>
- <string name="pref_wm8994_mono_downmix_title">Mélangeur Mono</string>
- <string name="pref_wm8994_mono_downmix_summary">Mixer le signal stéréo en mono (vers une sortie stéréo, comme des écouteurs)</string>
- <string name="pref_wm8994_stereo_expansion_title">Expansion Stéréo</string>
- <string name="pref_wm8994_stereo_expansion_summary">"Expand" le signal stéréo via le processeur de traitement du signal numérique</string>
- <string name="pref_wm8994_dac_direct_title">D/AC direct</string>
- <string name="pref_wm8994_dac_direct_summary">Accéder au convertisseur numérique analogique directement, en court-circuitant le mélangeur de canaux. Produit un son plus propre (signal sur bruit meilleur)</string>
- <string name="pref_wm8994_dac_osr128_title">Reproduction HiFi</string>
- <string name="pref_wm8994_dac_osr128_summary">Suréchantillonnage 128x du convertisseur analogique numérique -- son plus propre pour la reproduction de musique</string>
- <string name="pref_wm8994_adc_osr128_title">Enregistrement HiFi</string>
- <string name="pref_wm8994_adc_osr128_summary">Suréchantillonnage 128x du convertisseur analogique numérique -- améliore la qualité des enregistrements</string>
- <string name="pref_wm8994_fll_tuning_title">Horloge audio précise</string>
- <string name="pref_wm8994_fll_tuning_summary">Utiliser une source horloge audio précise -- améliore la qualité du son</string>
-
<string name="category_touchkey_title">Touches tactiles</string>
<string name="backlight_timeout_title_head">Délai rétroéclairage</string>
<string name="backlight_timeout_summary_head">Régler le délai avant l\'extinction du rétroéclairage des touches tactiles</string>
diff --git a/CrespoParts/res/values-ja/strings.xml b/CrespoParts/res/values-ja/strings.xml
index 9123ca9..37bafb8 100644
--- a/CrespoParts/res/values-ja/strings.xml
+++ b/CrespoParts/res/values-ja/strings.xml
@@ -11,37 +11,6 @@
<string name="color_green_title">緑</string>
<string name="color_blue_title">青</string>
- <!-- WM8994 Control Settings -->
- <string name="general_sound_title">サウンド</string>
- <!-- Categories -->
- <string name="category_wm8994_internal_speaker">スピーカー設定</string>
- <string name="category_wm8994_signal_processing">信号処理</string>
- <string name="category_wm8994_headphone_amp">ヘッドフォンアンプ</string>
- <string name="category_wm8994_codec_optimization">Codec最適化</string>
- <string name="category_wm8994_dac_config">デジタル/アナログコンバータ設定</string>
- <string name="category_wm8994_analog_path">アナログパス設定</string>
- <string name="category_wm8994_mic_settings">マイク設定</string>
- <!-- Titles/Summaries -->
- <string name="wm8994_settings_title_head">サウンド設定</string>
- <string name="wm8994_settings_title_subhead">サウンド設定</string>
- <string name="wm8994_settings_summary_head">WM8994サウンドプロセッサの高度な制御</string>
- <string name="pref_wm8994_control_enable_title">WM8994サウンドプロセッサの制御を有効にする</string>
- <string name="pref_wm8994_control_enable_summary">WM8994サウンドプロセッサの高度な制御を有効にする</string>
- <string name="pref_wm8994_speaker_tuning_title">音楽再生用のスピーカー調整</string>
- <string name="pref_wm8994_speaker_tuning_summary">より豊かな低音とバランスの取れた音質にするためハードウェアEQを再設定する</string>
- <string name="pref_wm8994_mono_downmix_title">モノダウンミックス</string>
- <string name="pref_wm8994_mono_downmix_summary">ステレオサウンドをモノラルサウンドへダウンミックスする(ヘッドホンなどのステレオ出力用)</string>
- <string name="pref_wm8994_stereo_expansion_title">ステレオ拡張モード</string>
- <string name="pref_wm8994_stereo_expansion_summary">DSPを使用することによりステレオサウンドを拡張する</string>
- <string name="pref_wm8994_dac_direct_title">D/AC ダイレクト</string>
- <string name="pref_wm8994_dac_direct_summary">チャンネルのミキサーをバイパスし、直接デジタル/アナログコンバーターにアクセスする。よりクリアな音質を生成（S/N比）</string>
- <string name="pref_wm8994_dac_osr128_title">Hi-fi再生</string>
- <string name="pref_wm8994_dac_osr128_summary">デジタル - アナログ コンバーター 128x オーバーサンプリング -- よりクリアな音で音楽を再生する</string>
- <string name="pref_wm8994_adc_osr128_title">Hi-fi録音</string>
- <string name="pref_wm8994_adc_osr128_summary">アナログ - デジタル コンバーター 128x オーバーサンプリング -- 録音品質を向上させる</string>
- <string name="pref_wm8994_fll_tuning_title">チューニング済みのaudio clock</string>
- <string name="pref_wm8994_fll_tuning_summary">チューニング済みのWM8994オーディオクロックソースを使用 -- 音質を向上させる</string>
-
<string name="category_touchkey_title">タッチキー</string>
<string name="backlight_timeout_title_head">バックライトのタイムアウト</string>
<string name="backlight_timeout_summary_head">タッチキーのバックライトが自動的にオフになるまでの遅延を調整する</string>
diff --git a/CrespoParts/res/values-nl/strings.xml b/CrespoParts/res/values-nl/strings.xml
index 14cc02c..6260c9a 100644
--- a/CrespoParts/res/values-nl/strings.xml
+++ b/CrespoParts/res/values-nl/strings.xml
@@ -9,37 +9,6 @@
<string name="color_green_title">Groen</string>
<string name="color_blue_title">Blauw</string>
- <!-- WM8994 Control Settings -->
- <string name="general_sound_title">Geluid</string>
- <!-- Categories -->
- <string name="category_wm8994_internal_speaker">Interne luidspreker aanpassen</string>
- <string name="category_wm8994_signal_processing">Signal Processing</string>
- <string name="category_wm8994_headphone_amp">Koptelefoon Amplifier</string>
- <string name="category_wm8994_codec_optimization">Codec Optimalisatie</string>
- <string name="category_wm8994_dac_config">Digitaal/Analoog Converter-instellingen</string>
- <string name="category_wm8994_analog_path">Analog Path aanpassen</string>
- <string name="category_wm8994_mic_settings">Microfoon-instellingen</string>
- <!-- Titles/Summaries -->
- <string name="wm8994_settings_title_head">Geluidsinstellingen</string>
- <string name="wm8994_settings_title_subhead">Geluidsinstellingen</string>
- <string name="wm8994_settings_summary_head">Geavanceerde controle van de WM8994-geluidsprocessor hardware</string>
- <string name="pref_wm8994_control_enable_title">Schakel WM8994-control in</string>
- <string name="pref_wm8994_control_enable_summary">Schakel geavanceerde controle van de WM8994-geluidsprocessor hardware in</string>
- <string name="pref_wm8994_speaker_tuning_title">Tune speaker for music</string>
- <string name="pref_wm8994_speaker_tuning_summary">Reconfigures the hardware EQ voor een betere bass en gebalanceerd geluid</string>
- <string name="pref_wm8994_mono_downmix_title">Mono downmix</string>
- <string name="pref_wm8994_mono_downmix_summary">Downmix stereo sound to mono (for stereo outputs, such as headphones)</string>
- <string name="pref_wm8994_stereo_expansion_title">Stereo-uitbreiding</string>
- <string name="pref_wm8994_stereo_expansion_summary">"Expand" stereo sound via digital signal processing</string>
- <string name="pref_wm8994_dac_direct_title">D/AC direct</string>
- <string name="pref_wm8994_dac_direct_summary">Stuur de digitaal/analoog-converter rechtstreeks aan, bypassing the channel mixer. Zorgt voor helderder geluid (lower signal-to-noise ratio)</string>
- <string name="pref_wm8994_dac_osr128_title">Hi-fi playback</string>
- <string name="pref_wm8994_dac_osr128_summary">Digitaal-to-analoog-converter 128x oversampling -- cleaner sound when playing music</string>
- <string name="pref_wm8994_adc_osr128_title">Hi-fi recording</string>
- <string name="pref_wm8994_adc_osr128_summary">Analoog-to-digitaal-converter 128x oversampling -- increases quality of recordings</string>
- <string name="pref_wm8994_fll_tuning_title">Tuned audio clock</string>
- <string name="pref_wm8994_fll_tuning_summary">Use tuned WM8994 audio clock source -- verbetert de geluidskwaliteit</string>
-
<string name="category_touchkey_title">Touch Keys</string>
<string name="backlight_timeout_title_head">Backlight Timeout</string>
<string name="backlight_timeout_summary_head">Pas de vertraging aan voor het touch key-backlight uitgaat</string>
diff --git a/CrespoParts/res/values-pt-rBR/strings.xml b/CrespoParts/res/values-pt-rBR/strings.xml
index e69046b..851189c 100755
--- a/CrespoParts/res/values-pt-rBR/strings.xml
+++ b/CrespoParts/res/values-pt-rBR/strings.xml
@@ -45,4 +45,6 @@
<string name="label_idle1">Ocioso</string>
<string name="label_idle2">Ociosidade Profunda (TOP=LIGADO)</string>
<string name="label_idle3">Ociosidade Profunda (TOP=DESLIGADO)</string>
+ <string name="bld_tuning_title_head">Ajustes do BLD</string>
+ <string name="bld_tuning_summary_head">Definir o tempo para a luz das teclas apagarem ( 0 significa nenhum BLD )</string>
</resources> \ No newline at end of file
diff --git a/CrespoParts/res/values-pt-rPT/strings.xml b/CrespoParts/res/values-pt-rPT/strings.xml
index 3b32960..4431cca 100644
--- a/CrespoParts/res/values-pt-rPT/strings.xml
+++ b/CrespoParts/res/values-pt-rPT/strings.xml
@@ -9,37 +9,6 @@
<string name="color_green_title">Verde</string>
<string name="color_blue_title">Azul</string>
- <!-- WM8994 Control Settings -->
- <string name="general_sound_title">Som</string>
- <!-- Categories -->
- <string name="category_wm8994_internal_speaker">Configuração do Altifalante Interno</string>
- <string name="category_wm8994_signal_processing">Processamento de Sinal</string>
- <string name="category_wm8994_headphone_amp">Amplificador de auscutador</string>
- <string name="category_wm8994_codec_optimization">Optimização de Codec</string>
- <string name="category_wm8994_dac_config">Definições de conversão Digital/Analógico</string>
- <string name="category_wm8994_analog_path">Definições de roteamento Analógico</string>
- <string name="category_wm8994_mic_settings">Definições de Microfone</string>
- <!-- Titles/Summaries -->
- <string name="wm8994_settings_title_head">Definições de Som</string>
- <string name="wm8994_settings_title_subhead">Definições de Som</string>
- <string name="wm8994_settings_summary_head">Controlo avançado do processador de som WM8994</string>
- <string name="pref_wm8994_control_enable_title">Activar controlo WM8994</string>
- <string name="pref_wm8994_control_enable_summary">Activar controlo avançado para o processador de som WM8994</string>
- <string name="pref_wm8994_speaker_tuning_title">Ajustar altifalante para música</string>
- <string name="pref_wm8994_speaker_tuning_summary">Reconfigurar equalizador de hardware para obter mais Bass/Boost</string>
- <string name="pref_wm8994_mono_downmix_title">Downmix Mono</string>
- <string name="pref_wm8994_mono_downmix_summary">Transforma estéreo sound em mono (para outputs estéreo, tais como headphones)</string>
- <string name="pref_wm8994_stereo_expansion_title">Expansão estéreo</string>
- <string name="pref_wm8994_stereo_expansion_summary">"Expande" som estéreo através de processamento digital</string>
- <string name="pref_wm8994_dac_direct_title">D/AC directamente</string>
- <string name="pref_wm8994_dac_direct_summary">Acede ao conversor digital/analógco directamente, evitando o misturador de canal. Produz áudio mais limpo (rácio de signal-noise mais baixo)</string>
- <string name="pref_wm8994_dac_osr128_title">Som Hi-fi</string>
- <string name="pref_wm8994_dac_osr128_summary">Conversor Digital-para-analógico com 128x de oversampling -- som mais limpo ao tocar música</string>
- <string name="pref_wm8994_adc_osr128_title">Gravação Hi-fi</string>
- <string name="pref_wm8994_adc_osr128_summary">Conversor Analógico-para-digital com 128x de oversampling -- aumenta a qualidade das gravações</string>
- <string name="pref_wm8994_fll_tuning_title">Ligar ao relógio de áudio</string>
- <string name="pref_wm8994_fll_tuning_summary">Usar o processador WM8994 como relógio para áudio -- aumenta a qualidade do som</string>
-
<string name="category_touchkey_title">Botões Capacitivos</string>
<string name="backlight_timeout_title_head">Temporizador Luz de Fundo</string>
<string name="backlight_timeout_summary_head">Ajusta o tempo que as teclas capacitivas demoram a desligar a sua luz de fundo</string>
diff --git a/CrespoParts/res/values-ru/strings.xml b/CrespoParts/res/values-ru/strings.xml
index 5b1adf2..2bcbe46 100644
--- a/CrespoParts/res/values-ru/strings.xml
+++ b/CrespoParts/res/values-ru/strings.xml
@@ -11,37 +11,6 @@
<string name="color_green_title">Зелёный</string>
<string name="color_blue_title">Синий</string>
- <!-- WM8994 Control Settings -->
- <string name="general_sound_title">Звук</string>
- <!-- Categories -->
- <string name="category_wm8994_internal_speaker">Настройка внутренних динамиков</string>
- <string name="category_wm8994_signal_processing">Обработка сигналов</string>
- <string name="category_wm8994_headphone_amp">Усиление наушников</string>
- <string name="category_wm8994_codec_optimization">Оптимизация кодека</string>
- <string name="category_wm8994_dac_config">Настройка цифрового/аналогового конвертера</string>
- <string name="category_wm8994_analog_path">Настройки аналогового пути</string>
- <string name="category_wm8994_mic_settings">Настройки микрофона</string>
- <!-- Titles/Summaries -->
- <string name="wm8994_settings_title_head">Настройки звука</string>
- <string name="wm8994_settings_title_subhead">Настройки звука</string>
- <string name="wm8994_settings_summary_head">Расширенное управление звуковым процессором WM8994</string>
- <string name="pref_wm8994_control_enable_title">Включить управление WM8994</string>
- <string name="pref_wm8994_control_enable_summary">Включить расширенное управление звуковым процессором WM8994</string>
- <string name="pref_wm8994_speaker_tuning_title">Настройка динамиков для воспроизведения музыки</string>
- <string name="pref_wm8994_speaker_tuning_summary">Перенастройка аппаратного эквалайзера для получения более низчких частот и сбалансированного звука</string>
- <string name="pref_wm8994_mono_downmix_title">Конвертация в моно</string>
- <string name="pref_wm8994_mono_downmix_summary">Конвертировать стереозвук в моно (для стереовыводы, например для наушников)</string>
- <string name="pref_wm8994_stereo_expansion_title">Расширение стерео</string>
- <string name="pref_wm8994_stereo_expansion_summary">Расширить стереозвук через обработку цифровых сигналов</string>
- <string name="pref_wm8994_dac_direct_title">Прямой D/AC</string>
- <string name="pref_wm8994_dac_direct_summary">Доступ к цифровому/аналоговому преобразователю напрямую, минуя канальный микшер. Способствует чистому звуку (более низкое соотношение сигнал-шум)</string>
- <string name="pref_wm8994_dac_osr128_title">Hi-fi воспроизведение</string>
- <string name="pref_wm8994_dac_osr128_summary">128-передискретизация цифрово-аналогового преобразователя - чистый звук при воспроизведении музыки</string>
- <string name="pref_wm8994_adc_osr128_title">Hi-fi запись</string>
- <string name="pref_wm8994_adc_osr128_summary">128-передискретизация аналого-цифрового преобразователя - повышает качество записи</string>
- <string name="pref_wm8994_fll_tuning_title">Настройка аудио-частот</string>
- <string name="pref_wm8994_fll_tuning_summary">Использовать настроенные аудио-частоты WM8994 - улучшает качество звука</string>
-
<string name="category_touchkey_title">Сенсорные кнопки</string>
<string name="backlight_timeout_title_head">Таймаут подсветки</string>
<string name="backlight_timeout_summary_head">Как долго работает подсветка сенсорных кнопок</string>
diff --git a/CrespoParts/res/values-tr/strings.xml b/CrespoParts/res/values-tr/strings.xml
index 469f5fd..8f1e947 100644
--- a/CrespoParts/res/values-tr/strings.xml
+++ b/CrespoParts/res/values-tr/strings.xml
@@ -10,37 +10,6 @@
<string name="color_green_title">Yeşil</string>
<string name="color_blue_title">Mavi</string>
- <!-- WM8994 Kontrol Ayarları -->
- <string name="general_sound_title">Ses</string>
- <!-- Kategoriler -->
- <string name="category_wm8994_internal_speaker">Dahili hoparlör konfigürasyonu</string>
- <string name="category_wm8994_signal_processing">Sinyal işleme</string>
- <string name="category_wm8994_headphone_amp">Kulaklık amplifikatörü</string>
- <string name="category_wm8994_codec_optimization">Codec optimizasyonu</string>
- <string name="category_wm8994_dac_config">Dijital / Analog Dönüştürücü ayarları</string>
- <string name="category_wm8994_analog_path">Analog yol konfigürasyonu</string>
- <string name="category_wm8994_mic_settings">Mikrofon ayarları</string>
- <!-- Titles/Summaries -->
- <string name="wm8994_settings_title_head">Ses ayarları</string>
- <string name="wm8994_settings_title_subhead">Ses ayarları</string>
- <string name="wm8994_settings_summary_head">WM8994 Ses işlemcisi donanımı gelişmiş kontrolü</string>
- <string name="pref_wm8994_control_enable_title">WM8994 Kontrolünü etkinleştir</string>
- <string name="pref_wm8994_control_enable_summary">WM8994 ses işlemcisi donanımı için gelişmiş denetimlerini etkinleştirme</string>
- <string name="pref_wm8994_speaker_tuning_title">Müzik için hoparlör ayarı</string>
- <string name="pref_wm8994_speaker_tuning_summary">Daha fazla bas ve dengeli bir ses elde etmek için EQ donanımını yeniden yapılandırır</string>
- <string name="pref_wm8994_mono_downmix_title">Mono indirgeme</string>
- <string name="pref_wm8994_mono_downmix_summary">Stereo sesi monoya indirgeme (stereo çıkış, kulaklık gibi)</string>
- <string name="pref_wm8994_stereo_expansion_title">Stereo geliştirme</string>
- <string name="pref_wm8994_stereo_expansion_summary">Dijital sinyal işleme üzerinden stereo ses "Gelistirme"</string>
- <string name="pref_wm8994_dac_direct_title">D / AC direkt</string>
- <string name="pref_wm8994_dac_direct_summary">Kanal mikser atlayarak, doğrudan, analog / dijital dönüştürücü erişim. Temiz ses (düşük sinyal-gürültü oranı) üretir.</string>
- <string name="pref_wm8994_dac_osr128_title">Hi-fi oynatma</string>
- <string name="pref_wm8994_dac_osr128_summary">Dijital-analog çevirici 128x örnekleme - Müzik çalarken daha temiz ses</string>
- <string name="pref_wm8994_adc_osr128_title">Hi-fi kaydı</string>
- <string name="pref_wm8994_adc_osr128_summary">Analog-dijital dönüştürücü 128x örnekleme -- kayıtların kalitesini artırır</string>
- <string name="pref_wm8994_fll_tuning_title">Ayarlı ses saati</string>
- <string name="pref_wm8994_fll_tuning_summary">WM8994 ses saati kaynağı ayarlı kullan - ses kalitesini artırır</string>
-
<string name="category_touchkey_title">Dokunmatik tuşlar</string>
<string name="backlight_timeout_title_head">Arka ışık zaman aşımı</string>
<string name="backlight_timeout_summary_head">Dokunmatik tuşa ışığı otomatik kapanmadan önceki gecikmeyi ayarlayın</string>
diff --git a/CrespoParts/res/values-zh-rCN/strings.xml b/CrespoParts/res/values-zh-rCN/strings.xml
index 8a266c2..e949f6f 100644
--- a/CrespoParts/res/values-zh-rCN/strings.xml
+++ b/CrespoParts/res/values-zh-rCN/strings.xml
@@ -19,17 +19,6 @@
<string name="color_green_title">绿</string>
<string name="color_blue_title">蓝</string>
- <string name="lulzactive_tuning_title_head">Lulzactive 调整</string>
- <string name="lulzactive_tuning_summary_head">lulzactive调节器的控制器参数</string>
- <string name="inccpuload_title">% 改变</string>
- <string name="pumpup_title">上调幅度</string>
- <string name="pumpdown_title">下调幅度</string>
- <string name="upsampletime_title">增加前时间[ms]</string>
- <string name="downsampletime_title">下降前时间[ms]</string>
- <string name="lulz_default_title">默认</string>
- <string name="lulz_batt_title">省电</string>
- <string name="lulz_speed_title">快速</string>
-
<string name="category_touchkey_title">触控键</string>
<string name="touchkey_notification_title_head">背光灯提醒</string>
<string name="touchkey_notification_summary_head">当有通知时触控键背光灯点亮.</string>
diff --git a/CrespoParts/res/values-zh-rTW/strings.xml b/CrespoParts/res/values-zh-rTW/strings.xml
index 0f475de..9f2ec87 100644
--- a/CrespoParts/res/values-zh-rTW/strings.xml
+++ b/CrespoParts/res/values-zh-rTW/strings.xml
@@ -11,37 +11,6 @@
<string name="color_green_title">綠</string>
<string name="color_blue_title">藍</string>
- <!-- WM8994 Control Settings -->
- <string name="general_sound_title">音效</string>
- <!-- Categories -->
- <string name="category_wm8994_internal_speaker">內置喇叭設定</string>
- <string name="category_wm8994_signal_processing">訊號處理</string>
- <string name="category_wm8994_headphone_amp">耳機擴音</string>
- <string name="category_wm8994_codec_optimization">編碼優化</string>
- <string name="category_wm8994_dac_config">數碼／類比轉換器設定</string>
- <string name="category_wm8994_analog_path">類比路徑設定</string>
- <string name="category_wm8994_mic_settings">麥克風設定</string>
- <!-- Titles/Summaries -->
- <string name="wm8994_settings_title_head">音效設定</string>
- <string name="wm8994_settings_title_subhead">音效設定</string>
- <string name="wm8994_settings_summary_head">WM8994 音效處理器硬體進階控制</string>
- <string name="pref_wm8994_control_enable_title">啟用 WM8994 控制</string>
- <string name="pref_wm8994_control_enable_summary">啟用 WM8994 音效處理器硬體的進階控制</string>
- <string name="pref_wm8994_speaker_tuning_title">為音樂調整喇叭</string>
- <string name="pref_wm8994_speaker_tuning_summary">重新設置硬體等化器以穫取更加低音及均衡的音效</string>
- <string name="pref_wm8994_mono_downmix_title">單聲道混合</string>
- <string name="pref_wm8994_mono_downmix_summary">將雙聲道混合成單聲道（用於雙聲道輸出，例如耳機）</string>
- <string name="pref_wm8994_stereo_expansion_title">雙聲道擴展</string>
- <string name="pref_wm8994_stereo_expansion_summary">透過數碼訊號處理，將雙聲道音效“擴展”</string>
- <string name="pref_wm8994_dac_direct_title">直接轉換數碼／類比</string>
- <string name="pref_wm8994_dac_direct_summary">繞過頻道混音器，直接存取數碼／類比轉換器，以產生更清晰音訊（較低的訊噪比）</string>
- <string name="pref_wm8994_dac_osr128_title">Hi-Fi 播放</string>
- <string name="pref_wm8994_dac_osr128_summary">數碼至類比的128倍過採樣轉換，使播放音樂時的音質更清晰</string>
- <string name="pref_wm8994_adc_osr128_title">Hi-Fi 錄音</string>
- <string name="pref_wm8994_adc_osr128_summary">類比至數碼的128倍過採樣轉換，提升錄音品質</string>
- <string name="pref_wm8994_fll_tuning_title">調整音訊時脈</string>
- <string name="pref_wm8994_fll_tuning_summary">使用調整了 WM8994 音訊時脈的原始碼，提升音效品質</string>
-
<string name="category_touchkey_title">觸控鍵</string>
<string name="backlight_timeout_title_head">背光逾時</string>
<string name="backlight_timeout_summary_head">調整觸控鍵背光自動關閉前的延遲時間</string>
diff --git a/include/sec_lcd.h b/include/sec_lcd.h
index 6a3a34a..82ef42f 100755
--- a/include/sec_lcd.h
+++ b/include/sec_lcd.h
@@ -34,6 +34,7 @@ struct secfb_user_window {
#define FBIO_WAITFORVSYNC _IO ('F', 32)
#define SECFB_WIN_POSITION _IOW ('F', 203, struct secfb_user_window)
#define S3CFB_SET_VSYNC_INT _IOW ('F', 206, uint32_t)
+#define S3CFB_WAIT_FOR_VSYNC _IOR ('F', 311, uint64_t)
#define DEFAULT_LCD_WIDTH (480)
#define DEFAULT_LCD_HEIGHT (800)
diff --git a/libhwcomposer/Android.mk b/libhwcomposer/Android.mk
index 72c7b59..7cc8228 100644
--- a/libhwcomposer/Android.mk
+++ b/libhwcomposer/Android.mk
@@ -29,6 +29,10 @@ LOCAL_C_INCLUDES := \
LOCAL_SRC_FILES := SecHWCUtils.cpp SecHWC.cpp
+ifeq ($(BOARD_CUSTOM_VSYNC_IOCTL),true)
+ LOCAL_CFLAGS += -DVSYNC_IOCTL
+endif
+
LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM)
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
diff --git a/libhwcomposer/SecHWC.cpp b/libhwcomposer/SecHWC.cpp
index dda1108..31d25f4 100644
--- a/libhwcomposer/SecHWC.cpp
+++ b/libhwcomposer/SecHWC.cpp
@@ -453,6 +453,17 @@ static int hwc_query(struct hwc_composer_device* dev,
return 0;
}
+#ifdef VSYNC_IOCTL
+// Linux version of a manual reset event to control when
+// and when not to ask the video card for a VSYNC. This
+// stops the worker thread from asking for a VSYNC when
+// there is nothing useful to do with it and more closely
+// mimicks the original uevent mechanism
+int vsync_enable = 0;
+pthread_mutex_t vsync_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_cond_t vsync_condition = PTHREAD_COND_INITIALIZER;
+#endif
+
static int hwc_eventControl(struct hwc_composer_device* dev,
int event, int enabled)
{
@@ -465,6 +476,18 @@ static int hwc_eventControl(struct hwc_composer_device* dev,
if (err < 0)
return -errno;
+#if VSYNC_IOCTL
+ // Enable or disable the ability for the worker thread
+ // to ask for VSYNC events from the video driver
+ pthread_mutex_lock(&vsync_mutex);
+ if(enabled) {
+ vsync_enable = 1;
+ pthread_cond_broadcast(&vsync_condition);
+ }
+ else vsync_enable = 0;
+ pthread_mutex_unlock(&vsync_mutex);
+#endif
+
return 0;
}
@@ -496,18 +519,47 @@ void handle_vsync_uevent(hwc_context_t *ctx, const char *buff, int len)
static void *hwc_vsync_thread(void *data)
{
hwc_context_t *ctx = (hwc_context_t *)(data);
+#ifdef VSYNC_IOCTL
+ uint64_t timestamp = 0;
+#else
char uevent_desc[4096];
memset(uevent_desc, 0, sizeof(uevent_desc));
+#endif
setpriority(PRIO_PROCESS, 0, HAL_PRIORITY_URGENT_DISPLAY);
+#ifndef VSYNC_IOCTL
uevent_init();
+#endif
while(true) {
+#ifdef VSYNC_IOCTL
+ // Only continue if hwc_eventControl is enabled, otherwise
+ // just sit here and wait until it is. This stops the code
+ // from constantly looking for the VSYNC event with the screen
+ // turned off.
+ pthread_mutex_lock(&vsync_mutex);
+ if(!vsync_enable) pthread_cond_wait(&vsync_condition, &vsync_mutex);
+ pthread_mutex_unlock(&vsync_mutex);
+
+ timestamp = 0; // Reset the timestamp value
+
+ // S3CFB_WAIT_FOR_VSYNC is a custom IOCTL I added to wait for
+ // the VSYNC interrupt, and then return the timestamp that was
+ // originally being communicated via a uevent. The uevent was
+ // spamming the UEventObserver and events/0 process with more
+ // information than this device could really deal with every 18ms
+ int res = ioctl(ctx->global_lcd_win.fd, S3CFB_WAIT_FOR_VSYNC, &timestamp);
+ if(res > 0) {
+ if(!ctx->procs || !ctx->procs->vsync) continue;
+ ctx->procs->vsync(ctx->procs, 0, timestamp);
+ }
+#else
int len = uevent_next_event(uevent_desc, sizeof(uevent_desc) - 2);
bool vsync = !strcmp(uevent_desc, "change@/devices/platform/s3cfb");
if(vsync)
handle_vsync_uevent(ctx, uevent_desc, len);
+#endif
}
return NULL;
generated by cgit v1.1 at 2024-05-05 20:27:35 +0000