From 963c7db9b28c3143e4b7fcdbf6e7b4303d3dac96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Espen=20Fjellv=C3=A6r=20Olsen?= Date: Sun, 2 Sep 2012 15:13:55 +0200 Subject: [PATCH 01/52] Update to new boot animation Change-Id: If81ce25f40c105fcb7b00cbe41be0030630e961b --- cm.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cm.mk b/cm.mk index 5f28641c..b12550d2 100644 --- a/cm.mk +++ b/cm.mk @@ -20,6 +20,10 @@ $(call inherit-product, vendor/cm/config/gsm.mk) # Release name PRODUCT_RELEASE_NAME := GT-I9100 +# Bootanimation +TARGET_SCREEN_HEIGHT := 800 +TARGET_SCREEN_WIDTH := 480 + # Inherit some common CM stuff. $(call inherit-product, vendor/cm/config/common_full_phone.mk) From f5ac19d9fdfdf21ea1d865a684337d94086af766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20T=C3=B3th?= Date: Mon, 3 Sep 2012 09:25:05 +0200 Subject: [PATCH 02/52] Added hungarian translations for DeviceSettings Change-Id: I24c4d891bfd648b688db83b23977ccd68df863cb --- DeviceSettings/res/values-hu/arrays.xml | 69 ++++++++++++++++++++++++ DeviceSettings/res/values-hu/strings.xml | 50 +++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 DeviceSettings/res/values-hu/arrays.xml create mode 100644 DeviceSettings/res/values-hu/strings.xml diff --git a/DeviceSettings/res/values-hu/arrays.xml b/DeviceSettings/res/values-hu/arrays.xml new file mode 100644 index 00000000..bab1ea54 --- /dev/null +++ b/DeviceSettings/res/values-hu/arrays.xml @@ -0,0 +1,69 @@ + + + + Kamera (Alapbeállítás) + Videó + Videó (Meleg árnyalat) + Videó (Hideg árnyalat) + Felhasználói felület + Navigáció + Galéria + VT + + + + Hagyományos (Alapbeállítás) + Dinamikus + Természetes + Film + + + + Hagyományos + Fordított + + + + Kikapcsolva (Alapbeállítás) + Bekapcsolva + + + + 2.2 (Alapbeállítás) + 1.9 + + + + 10 + 20 + 30 + 50 (Alapbeállítás) + 70 + 100 + + + + 0% + 25% + 50% (Alapbeállítás) + 75% + 100% + + + + UMTS + HSDPA + HSDPA + HSUPA + + + + Soha + 1 másodperc + 2 másodperc + 3 másodperc (Alapbeállítás) + 4 másodperc + 5 másodperc + 6 másodperc + + + diff --git a/DeviceSettings/res/values-hu/strings.xml b/DeviceSettings/res/values-hu/strings.xml new file mode 100644 index 00000000..1a27b0cf --- /dev/null +++ b/DeviceSettings/res/values-hu/strings.xml @@ -0,0 +1,50 @@ + + + Galaxy S II Beállítások + + Kijelző + Színek + Megjelenítés + mDNIe megjelenítési beállítások + Üzemmód + mDNIe üzemmódok + Negatív üzemmód + Fordított színek ki/be + Szabadtéri üzemmód + Szabadtéri üzemmód ki/be + Kijelző gamma-értéke + Kijelző gamma-érték beállítása + + Érintőképernyő + Érzékenység + Érintőképernyő érzékenységének beállítása + + Érintőgombok + Érintőgombok háttérvilágítása + Bekapcsolja az érintőgombok háttérvilágítását bekapcsolt képernyőnél + Háttérvilágítás időkorlátja + Háttérvilágítás késleltetése + + Szenzorok + Giroszkóp + Kalibrálási érték használata + Kalibrálási érték használata. Érdemes újra kalibrálni, ha ez a funkció használatban van! + Kalibrálás + Kalibráláshoz a telefont vízszintes felületre kell helyezni, és megérinteni ezt a gombot + Kalibrálás befejezve + Az érzékelő sikeresen bekalibrálva. + + Érintési visszajelzés + Rezgés + Rezgés erőssége + Rezgés erősségének beállítása + + GSM Rádió + HSPA + HSDPA/HSUPA engedélyezése + + Dokkoló + Dokkoló hangszórók + Dokkoló hangszóróinak használata + Használja a dokkoló passzív hangkimenetét + From af681a6197f077e6d4dd5f8eaa4702288b3069ff Mon Sep 17 00:00:00 2001 From: Jorge Ruesga Date: Sat, 8 Sep 2012 03:28:28 +0200 Subject: [PATCH 03/52] Device i9100: Spanish translations Spanish translations for SGSII advanced settings Patch 2: Remove trailing whitespaces Patch 3: Typos Change-Id: I2cd834bd0d963ea3b2c887db9fc2c69892e605a3 --- DeviceSettings/res/values-es/arrays.xml | 59 ++++++++++++++++++++++++ DeviceSettings/res/values-es/strings.xml | 43 +++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 DeviceSettings/res/values-es/arrays.xml create mode 100644 DeviceSettings/res/values-es/strings.xml diff --git a/DeviceSettings/res/values-es/arrays.xml b/DeviceSettings/res/values-es/arrays.xml new file mode 100644 index 00000000..3666e4eb --- /dev/null +++ b/DeviceSettings/res/values-es/arrays.xml @@ -0,0 +1,59 @@ + + + Cámara (por defecto) + Vídeo + Vídeo cálido + Vídeo frío + UI + Navegación + Galería + VT + + + Estándar (por defecto) + Dinámico + Natural + Película + + + Normal + Invertido + + + Apagado (por defecto) + Encendido + + + 2.2 (por defecto) + 1.9 + + + 10 + 20 + 30 + 50 (por defecto) + 70 + 100 + + + 0% + 25% + 50% (por defecto) + 75% + 100% + + + Solo UMTS + Solo HSDPA + HSDPA + HSUPA + + + Nunca + 1 segundo + 2 segundos + 3 segundos (por defecto) + 4 segundos + 5 segundos + 6 segundos + + diff --git a/DeviceSettings/res/values-es/strings.xml b/DeviceSettings/res/values-es/strings.xml new file mode 100644 index 00000000..c3cc2dfc --- /dev/null +++ b/DeviceSettings/res/values-es/strings.xml @@ -0,0 +1,43 @@ + + + "Ajustes Galaxy S II" + "Pantalla" + "Colores" + "Escenario" + "Establecer escenario mDNIe" + "Modo" + "Establecer modo mDNIe" + "Modo negativo" + "Habilitar/deshabilitar colores invertidos" + "Modo al aire libre" + "Habilitar/deshabilitar modo al aire libre" + "Gamma" + "Establece el valor Gamma de la pantalla" + "Pantalla táctil" + "Sensibilidad táctil" + "Establecer la sensibilidad del panel táctil" + "Teclas táctiles" + "Habilitar retroiluminación de teclas táctiles" + "Retroiluminación teclas táctiles cuando la pantalla está activa" + "Tiempo de espera de retroiluminación" + "Tiempo tras pulsar una tecla antes de apagar la retroiluminación" + "Sensores" + "Acelerómetro" + "Usar datos de calibración" + "Usar los valores de calibración del acelerómetro. ¡Realizar una calibración después de habilitar esta funcionalidad!" + "Calibrar" + "Poner el teléfono sobre una superficie plana, y presionar este menú para calibrar de nuevo" + "Calibración realizada" + "El sensor ha sido calibrado satisfactoriamente" + "Háptica" + "Vibración" + "Intensidad de vibración" + "Establecer la intensidad de vibración" + "Radio" + "HSPA" + "Habilitar HSDPA/HSUPA" + "Conector" + "Audio" + "Usar el conector de audio USB" + "Usar la salida de audio pasiva cuando el conector USB esté activado" + From bdaa3ae0821c9618342d53c9fd729667890030d3 Mon Sep 17 00:00:00 2001 From: rheeze Date: Thu, 13 Sep 2012 13:28:45 +0200 Subject: [PATCH 04/52] i9100 Advanced Settings: Added italian translation Change-Id: Ie9c35077d9b6c2ae14d46e82ff748ac2e2f627fa --- DeviceSettings/res/values-it/strings.xml | 44 ++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 DeviceSettings/res/values-it/strings.xml diff --git a/DeviceSettings/res/values-it/strings.xml b/DeviceSettings/res/values-it/strings.xml new file mode 100644 index 00000000..c32640ca --- /dev/null +++ b/DeviceSettings/res/values-it/strings.xml @@ -0,0 +1,44 @@ + + + Impostazioni Galaxy S II + Schermo + Colori + Scenario + Imposta lo scenario mDNIe + Modalità + Imposta la modalità mDNIe + Negativo + Abilita/disabilita i colori invertiti + Esterno + Abilita/disabilita la modalità esterno + Gamma schermo + Imposta il valore gamma dello schermo + Schermo tattile + Sensibilità tocco + Imposta la sensibilità al tocco dello schermo + Tasti a sfioramento + Retroilluminazione + Abilita la retroilluminazione dei tasti a sfioramento quando lo schermo è attivo + Timer retroilluminazione + Imposta l\'intervallo dopo cui la retroilluminazione dei tasti si spegne + Sensori + Accelerometro + Usa dati di calibrazione + Usa i valori di calibrazione dell\'accelerometro. Effettuare una calibrazione dopo aver attivato questa impostazione! + Calibrazione + Posizionare il telefono su una superficie orizzontale piana e premere per effettuare la calibrazione + Calibrazione effettuata + Il sensore è stato correttamente calibrato. + Feedback tattile + Vibratore + Intensità vibrazione + Imposta l\'intensità della vibrazione + Radio + HSPA + Abilita HSDPA/HSUPA + Dock + Audio + Usa USB audio in dock + Usa l\'uscita audio passiva quando in dock + + From 8f0627636922dead4534eec5b0a4257e03e279c5 Mon Sep 17 00:00:00 2001 From: Gustavo Rosa Date: Fri, 14 Sep 2012 12:35:11 -0700 Subject: [PATCH 05/52] PT-BR: Added missing translations Change-Id: I357602e40a7495901bd2093aa8b8929c2d3b736a --- DeviceSettings/res/values-pt-rBR/arrays.xml | 60 ++++++++++++++++++++ DeviceSettings/res/values-pt-rBR/strings.xml | 43 ++++++++++++++ 2 files changed, 103 insertions(+) create mode 100755 DeviceSettings/res/values-pt-rBR/arrays.xml create mode 100755 DeviceSettings/res/values-pt-rBR/strings.xml diff --git a/DeviceSettings/res/values-pt-rBR/arrays.xml b/DeviceSettings/res/values-pt-rBR/arrays.xml new file mode 100755 index 00000000..3e634d02 --- /dev/null +++ b/DeviceSettings/res/values-pt-rBR/arrays.xml @@ -0,0 +1,60 @@ + + + + Câmera (Padrão) + Vídeo + Vídeo Quente + Vídeo Frio + IU + Navegação + Galeria + VT + + + Padrão + Dinâmico + Natural + Filme + + + Normal + Invertido + + + Desligado (Padrão) + Ligado + + + 2.2 (Padrão) + 1.9 + + + 10 + 20 + 30 + 50 (Padrão) + 70 + 100 + + + 0% + 25% + 50% (Padrão) + 75% + 100% + + + Somente UMTS + Somente HSDPA + HSDPA + HSUPA + + + Nunca + 1 segundo + 2 segundos + 3 segundos (padrão) + 4 segundos + 5 segundos + 6 segundos + + \ No newline at end of file diff --git a/DeviceSettings/res/values-pt-rBR/strings.xml b/DeviceSettings/res/values-pt-rBR/strings.xml new file mode 100755 index 00000000..f821e8bd --- /dev/null +++ b/DeviceSettings/res/values-pt-rBR/strings.xml @@ -0,0 +1,43 @@ + + + Config. Galaxy S II + Cores + Cenário + Define o Cenário mDNIe + Modo + Define o Modo mDNIe + Modo Negativo + Ativa/Desativa cores invertidas + Modo Ao Ar Livre + Ativa/Desativa modo ao ar livre + Gama da Tela + Define valor da gama da tela + Tela sensível ao toque + Sensitividade do toque + Define a sensitividade do toque na tela + Tecla sensível ao toque + Ativar luz de fundo das teclas + Acender as teclas sensíveis ao toque quando a tela estiver ligada + Tempo limite da luz de fundo + Quanto tempo a luz de fundo irá ficar acesa depois do botão ser pressionado + Sensores + Resposta Tátil + Vibração + Intensidade da Vibração + Define a intensidade da vibração + Rádio + HSPA + Ativa HSDPA/HSUPA + Tela + Acelerômetro + Usar dados de calibragem + Usa os valores dos dados de calibragem. Calibre após marcar isto! + Calibrar + Coloque seu telefone em uma superfície plana, e pressione isto para calibrar + Calibragem terminada + O sensor foi calibrado com sucesso. + Dock + Áudio + Usar Áudio USB do Dock + Usar o áudio de saída passivo no dock + \ No newline at end of file From 08075bc2b57433dd374b7a2fe61fdba0cfe9aad0 Mon Sep 17 00:00:00 2001 From: Niko Koivu Date: Sat, 8 Sep 2012 01:01:36 +0300 Subject: [PATCH 06/52] i9100 devicesettings: added finnish translations Change-Id: Ibf0c8dd047e98429219ac386932a2e7c32a541a7 --- DeviceSettings/res/values-fi/arrays.xml | 69 ++++++++++++++++++++++++ DeviceSettings/res/values-fi/strings.xml | 50 +++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 DeviceSettings/res/values-fi/arrays.xml create mode 100644 DeviceSettings/res/values-fi/strings.xml diff --git a/DeviceSettings/res/values-fi/arrays.xml b/DeviceSettings/res/values-fi/arrays.xml new file mode 100644 index 00000000..6db9aa84 --- /dev/null +++ b/DeviceSettings/res/values-fi/arrays.xml @@ -0,0 +1,69 @@ + + + + Kamera (Oletus) + Video + Video(Lämmin) + Video(Kylmä) + Käyttöliittymä + Navigointi + Galleria + VT + + + + Standardi (Oletus) + Dynaaminen + Luonnollinen + Elokuva + + + + Normaali + Käänteinen + + + + Pois päältä (Oletus) + Päällä + + + + 2.2 (Oletus) + 1.9 + + + + 10 + 20 + 30 + 50 (Oletus) + 70 + 100 + + + + 0% + 25% + 50% (Oletus) + 75% + 100% + + + + Vain UMTS + Vain HSDPA + HSDPA + HSUPA + + + + Never + 1 second + 2 seconds + 3 seconds (Oletus) + 4 seconds + 5 seconds + 6 seconds + + + diff --git a/DeviceSettings/res/values-fi/strings.xml b/DeviceSettings/res/values-fi/strings.xml new file mode 100644 index 00000000..37087f69 --- /dev/null +++ b/DeviceSettings/res/values-fi/strings.xml @@ -0,0 +1,50 @@ + + + Galaxy S II-asetukset + + Näyttö + Värit + Skenaario + Vaihda mDNIe-skenaario + Tila + Vaihda mDNIe-tila + Negatiivi-tila + Käytä käänteisiä värejä + Ulkoilma-tila + Ota ulkoilma-tila käyttöön + Näytön gamma + Säädä näytön gamma-arvo + + Kosketusnäyttö + Kosketuksen herkkyys + Säädä näytön herkkyyttä + + Kosketusnäppäimet + Ota näppäinten taustavalo käyttöön + Näytön ollessa päällä valot syttyvät + Taustavalon aikakatkaisu + Säädä taustavalon sammumisen aikaväliä kosketuksesta + + Sensorit + Kiihtyvyysanturi + Käytä kalibrointitietoja + Käytä kiihtyvyysanturin kalibrointiarvoja. Kalibroi merkattuasi tämän! + Kalibroi + Aseta puhelin tasaiselle alustalle ja paina tätä kalibroidaksesi + Kalibrointi valmis + Sensori kalibroitu onnistuneesti + + Haptinen + Värinä + Värinän voimakkuus + Säädä värinän voimakkuutta + + Radio + HSPA + Ota HSDPA/HSUPA käyttöön + + Telakka + Audio + Käytä USB-audiotelakkaa + Käytä telakan audioulostuloa + From f1df05c15d480c2f66151bb8a1514f68143adce1 Mon Sep 17 00:00:00 2001 From: coudu Date: Wed, 12 Sep 2012 17:44:53 +0200 Subject: [PATCH 07/52] Remove ics branch string for SamsungServiceMode in dependencies file * This is not needed as there is a jb branch for SamsungServiceMode Change-Id: If54f9d2ea7044503cf233b99ab3e3873c7b4c7ee --- cm.dependencies | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cm.dependencies b/cm.dependencies index f834d9de..a8be07c0 100644 --- a/cm.dependencies +++ b/cm.dependencies @@ -13,7 +13,6 @@ }, { "repository": "android_packages_apps_SamsungServiceMode", - "target_path": "packages/apps/SamsungServiceMode", - "branch": "ics" + "target_path": "packages/apps/SamsungServiceMode" } ] From 90157b6668fd5545d87b5c05b8d240eb846764d9 Mon Sep 17 00:00:00 2001 From: Andrew Jiang Date: Tue, 2 Oct 2012 20:59:18 -0400 Subject: [PATCH 08/52] I9100: Simplified Chinese Translations Ported from CM9 with modifications. Change-Id: I017bf580bcb3c9a81de7214b39e5a029de1c842a --- DeviceSettings/res/values-zh-rCN/arrays.xml | 69 ++++++++++++++++++++ DeviceSettings/res/values-zh-rCN/strings.xml | 50 ++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 DeviceSettings/res/values-zh-rCN/arrays.xml create mode 100644 DeviceSettings/res/values-zh-rCN/strings.xml diff --git a/DeviceSettings/res/values-zh-rCN/arrays.xml b/DeviceSettings/res/values-zh-rCN/arrays.xml new file mode 100644 index 00000000..d9e9a34e --- /dev/null +++ b/DeviceSettings/res/values-zh-rCN/arrays.xml @@ -0,0 +1,69 @@ + + + + 照相 (默认) + 影片 + 影片 (温) + 影片 (冷) + 界面 + 导航 + 图库 + VT + + + + 标准 (默认) + 动态 + 自然 + 电影 + + + + 正常 + 反色 + + + + 禁用 (默认) + 启用 + + + + 2.2 (默认) + 1.9 + + + + 10 + 20 + 30 + 50 (默认) + 70 + 100 + + + + 0% + 25% + 50% (默认) + 75% + 100% + + + + 仅使用 UMTS + 仅使用 HSDPA + 使用 HSDPA + HSUPA + + + + 从不 + 1 秒 + 2 秒 + 3 秒 (默认) + 4 秒 + 5 秒 + 6 秒 + + + diff --git a/DeviceSettings/res/values-zh-rCN/strings.xml b/DeviceSettings/res/values-zh-rCN/strings.xml new file mode 100644 index 00000000..f3971f20 --- /dev/null +++ b/DeviceSettings/res/values-zh-rCN/strings.xml @@ -0,0 +1,50 @@ + + + Galaxy S II 设置 + + 屏幕 + 颜色 + 场景 + 设置 mDNIe 场景 + 模式 + 设置 mDNIe 模式 + 负极模式 + 启用/禁用反色 + 户外模式 + 启用/禁用户外模式 + 屏幕珈玛 + 设置屏幕珈玛 + + 触摸屏 + 触摸屏灵敏度 + 设置触摸屏灵敏度 + + 触摸键 + 启用触摸键背光灯 + 屏幕开启时触摸键将会点亮 + 背光灯超时 + 设置背光灯超时时间 + + 感应器 + 加速规 + 使用校准数据 + 使用加速规的校准数据. 请在检查此之后重新校准! + 校准 + 把手机放在平面上，然后点击此按键进行校准 + 校准完成 + 感应器已被成功的校准. + + 振动 + 振动器 + 振动器强度 + 设置振动器强度 + + 无线电 + HSPA + 启用 HSDPA/HSUPA + + 基座 + 音频 + 使用基座的 USB 音频 + 使用基座上的被动音频输出 + From 0f826c19beb2c064aa7a25406d192d61c633e592 Mon Sep 17 00:00:00 2001 From: Marek Walczak Date: Sat, 6 Oct 2012 16:31:00 +0200 Subject: [PATCH 09/52] Replace old libion.so with libsecion.so Patchset 2: Removed trailing space Patchset 3: Renamed libsamsungion to libsecion Change-Id: I08ee35c95a680bfa8021c56bb237baf332e393e0 --- proprietary-common-files.txt | 2 +- proprietary-files.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proprietary-common-files.txt b/proprietary-common-files.txt index b672a11c..f4b5fecb 100644 --- a/proprietary-common-files.txt +++ b/proprietary-common-files.txt @@ -52,7 +52,7 @@ system/lib/egl/libGLESv2_mali.so system/lib/hw/gralloc.exynos4.so system/lib/libMali.so system/lib/libUMP.so -system/lib/libion.so +system/lib/libsecion.so system/bin/bintvoutservice system/lib/libTVOut.so system/lib/libcec.so diff --git a/proprietary-files.sh b/proprietary-files.sh index 4d6ea7a5..650ffa81 100755 --- a/proprietary-files.sh +++ b/proprietary-files.sh @@ -65,7 +65,7 @@ PRODUCT_PACKAGES += \\ libhdmi \\ libhdmiclient \\ libmediayamahaservice \\ - libsamsungion + libsecion PRODUCT_COPY_FILES += \\ vendor/__VENDOR__/__COMMON__/proprietary/system/lib/hw/camera.exynos4.so:system/lib/hw/vendor-camera.exynos4.so \\ @@ -111,9 +111,9 @@ LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -LOCAL_MODULE := libsamsungion +LOCAL_MODULE := libsecion LOCAL_MODULE_OWNER := samsung -LOCAL_SRC_FILES := system/lib/libion.so +LOCAL_SRC_FILES := system/lib/libsecion.so LOCAL_MODULE_TAGS := optional LOCAL_MODULE_SUFFIX := .so LOCAL_MODULE_CLASS := SHARED_LIBRARIES From 1a26608f21f4ae82e2152e385202a9b2bc02c787 Mon Sep 17 00:00:00 2001 From: thunderger Date: Tue, 9 Oct 2012 15:41:47 +0200 Subject: [PATCH 10/52] i9100: updated german translation Change-Id: I3f96e512bb62e8f0b7bf2466a59265c092c23127 --- DeviceSettings/res/values-de/strings.xml | 50 ++++++++++++------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/DeviceSettings/res/values-de/strings.xml b/DeviceSettings/res/values-de/strings.xml index 990227df..a4365e90 100644 --- a/DeviceSettings/res/values-de/strings.xml +++ b/DeviceSettings/res/values-de/strings.xml @@ -4,47 +4,47 @@ Bildschirm Farben - Szenario - Wähle das mDNIe Szenario - Modus - Wähle den mDNIe Modus - Negativ Modus - Aktiviert/Deaktiviert negierte Farben - Outdoor Modus - Aktiviert/Deaktiviert den Outdoor Modus - Gamma Einstellung - Setzt den Gamma Wert + mDNIe-Szenario + mDNIe-Szenario auswählen + mDNIe-Modus + mDNIe-Modus auswählen + Negativ + Farben invertieren an/aus + Outdoor + Outdoor-Modus an/aus + Gamma + Gamma Wert Touchscreen - Sensitivität - Setzt die Touchpanel Sensitivität + Empfindlichkeit + Berührungs-Empfindlichkeit Touchkeys - Aktiviere Beleuchtung - Tasten leuchten auf während der Birdschirm aktiv ist - Zeitabschaltung der Beleuchtung - Setze Zeit für automatische Abschaltung + Beleuchtung + Touchkeys leuchten auf während das Display aktiv ist + Beleuchtungs-Timeout + Zeit für die autom. Abschaltung der Touchkey-Beleuchtung Sensoren Beschleunigungssensor Kalibierungsdaten - Benutze Kalibrierungswerte. Bitte nach Aktivierung eine Kalibrierung durchführen! + Kalibrierungswerte verwenden\nNach Aktivierung bitte Kalibrierung ausführen Kalibrieren - Lege dein Telefon auf einen geraden Untergrund und starte die Kalibrierung. + Sensor kalibrieren\nZum Starten das Telefon auf eine horizontale, ebene Fläche legen Kalibrierung beendet - Der Sensor wurde erfolgreich kalibriert. + Der Beschleunigungssensor wurde kalibriert Haptik - Vibrator - Vibrator Intensität - Setze Vibrator Intensität + Vibration + Intensität + Vibrations-Intensität Mobilfunk HSPA - Aktiviert HSDPA/HSUPA + HSDPA/HSUPA an/aus Dock Audio - Use Dock USB Audio - Use the passive audio out on the dock + USB-Dock Audio + Passive Audio-Ausgabe des USB-Docks verwenden From e5b37b2548424642976f01aeedea94156886d1ed Mon Sep 17 00:00:00 2001 From: codeworkx Date: Mon, 22 Oct 2012 17:09:21 +0200 Subject: [PATCH 11/52] enable home-key unlock setting Change-Id: I47366c514c7a4b656c4957222ddac418253ba050 --- overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 5aee5fc0..a4ef745e 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -154,4 +154,7 @@ config to 7. --> 7 + + false + From 0f3fa1a60545c4e7700b741f3c8b0638b333a666 Mon Sep 17 00:00:00 2001 From: Marco Brohet Date: Wed, 12 Sep 2012 19:16:31 +0200 Subject: [PATCH 12/52] i9100: Dutch translations for DeviceSettings Change-Id: If45624acc99430217e5a8a9fe3a16864675775e1 --- DeviceSettings/res/values-nl/arrays.xml | 75 ++++++++++++++++++++++++ DeviceSettings/res/values-nl/strings.xml | 65 ++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 DeviceSettings/res/values-nl/arrays.xml create mode 100644 DeviceSettings/res/values-nl/strings.xml diff --git a/DeviceSettings/res/values-nl/arrays.xml b/DeviceSettings/res/values-nl/arrays.xml new file mode 100644 index 00000000..3e15c113 --- /dev/null +++ b/DeviceSettings/res/values-nl/arrays.xml @@ -0,0 +1,75 @@ + + + + + Camera (standaard) + Video + Video (warm) + Video (koud) + Uiterlijk + Navigatie + Galerij + VT + + + Standaard + Dynamisch + Natuurlijk + Film + + + Normaal + Omgedraaid + + + Uit (standaard) + Aan + + + 2,2 (standaard) + 1,9 + + + 10 + 20 + 30 + 50 (standaard) + 70 + 100 + + + 0% + 25% + 50% (standaard) + 75% + 100% + + + Alleen UMTS + Alleen HSDPA + HSDPA & HSUPA + + + Nooit + 1 seconde + 2 seconden + 3 seconden (standaard) + 4 seconden + 5 seconden + 6 seconden + + diff --git a/DeviceSettings/res/values-nl/strings.xml b/DeviceSettings/res/values-nl/strings.xml new file mode 100644 index 00000000..dcd843f2 --- /dev/null +++ b/DeviceSettings/res/values-nl/strings.xml @@ -0,0 +1,65 @@ + + + + Galaxy S II-instellingen + + Kleuren + Scherm + Scenario + mDNIe-scenario instellen + Modus + mDNIe-modus instellen + Negatieve modus + Negatieve kleuren in-/uitschakelen + Buitenmodus + Buitenmodus in-/uitschakelen + Schermgamma + Schermgammawaarden instellen + + Aanraakscherm + Aanraakgevoeligheid + Gevoeligheid aanraakscherm instellen + + Aanraakknop + Achtergrondlicht bij knoppen inschakelen + Aanraakknoppen oplichten indien scherm aan is + Time-out achtergrondlicht + Vertraging na druk op een knop voor uitschakelen achtergrondlicht + + Sensoren + Gyroscoop + Kalibratiegegevens gebruiken + Kalibratiewaarden van de gyroscoop gebruiken. Voer hierna a.u.b. een kalibratie uit. + Kalibreren + Plaats de telefoon op een vlakke ondergrond en tik hier om te kalibreren + Kalibratie afgerond + De sensor is succesvol gekalibreerd. + + Trillen + Trillen + Trilintensiteit + Trilintensiteit instellen + + Radio + HSPA + HSDPA/HSUPA inschakelen + + Dock + Geluid + USB-geluidsdock + Passieve geluidsuitgang van het dock gebruiken + From b84cd997c0e96539e73ad06cb1bc0946a9828fad Mon Sep 17 00:00:00 2001 From: Marco Brohet Date: Fri, 9 Nov 2012 19:52:48 +0100 Subject: [PATCH 13/52] i9100: Dutch translations for DeviceSettings Change-Id: Id2ee22a1ac2b364e4d0e646ff6b26eeeb0c11e51 --- DeviceSettings/res/values-nl/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DeviceSettings/res/values-nl/strings.xml b/DeviceSettings/res/values-nl/strings.xml index dcd843f2..dba61e17 100644 --- a/DeviceSettings/res/values-nl/strings.xml +++ b/DeviceSettings/res/values-nl/strings.xml @@ -18,7 +18,7 @@ Galaxy S II-instellingen Kleuren - Scherm + Scherm Scenario mDNIe-scenario instellen Modus @@ -41,9 +41,9 @@ Vertraging na druk op een knop voor uitschakelen achtergrondlicht Sensoren - Gyroscoop - Kalibratiegegevens gebruiken - Kalibratiewaarden van de gyroscoop gebruiken. Voer hierna a.u.b. een kalibratie uit. + Gyroscoop + Kalibratiegegevens gebruiken + Kalibratiewaarden van de gyroscoop gebruiken. Voer hierna a.u.b. een kalibratie uit. Kalibreren Plaats de telefoon op een vlakke ondergrond en tik hier om te kalibreren Kalibratie afgerond From 352fc608ce335c5c087bc96e7f8cb730a58ecae2 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Sun, 2 Dec 2012 15:53:10 +0100 Subject: [PATCH 14/52] overlay: disable non-existing overlays Change-Id: Ibd0918ec05b03677c1ce5ae981a0c072907ce713 --- overlay/frameworks/base/core/res/res/values/config.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index a4ef745e..0c4526b2 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -152,9 +152,9 @@ 16 - App switch For example, a device with Home, Back and Menu keys would set this config to 7. --> - 7 + - false + From 5366c68670140bc311b06ab77c26a7e628a7bf8c Mon Sep 17 00:00:00 2001 From: codeworkx Date: Sun, 2 Dec 2012 16:01:57 +0100 Subject: [PATCH 15/52] i9100: add bluetooth build cfg Change-Id: Id905163db2e8cb2369aa27c619fbda36ad5b2643 --- BoardConfig.mk | 3 +++ bluetooth/bdroid_buildcfg.h | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 bluetooth/bdroid_buildcfg.h diff --git a/BoardConfig.mk b/BoardConfig.mk index 4b7e846f..a85a3b67 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -21,6 +21,9 @@ TARGET_BOARD_INFO_FILE := device/samsung/i9100/board-info.txt +# Bluetooth +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/i9100/bluetooth + # Inline kernel building TARGET_KERNEL_SOURCE := kernel/samsung/smdk4210 TARGET_KERNEL_CONFIG := cyanogenmod_i9100_defconfig diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h new file mode 100644 index 00000000..3fab58ea --- /dev/null +++ b/bluetooth/bdroid_buildcfg.h @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * Copyright (C) 2012 The CyanogenMod Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef _BDROID_BUILDCFG_H +#define _BDROID_BUILDCFG_H + +#define BTM_DEF_LOCAL_NAME "GT-I9100" + +#endif From a085b585d7d8f8a28807857ca38d8d1894f110f0 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Sun, 2 Dec 2012 16:24:54 +0100 Subject: [PATCH 16/52] i9100: update dock settings for mr1 Change-Id: Ia1bebcfd817bffeed89efb50b0fd18951d965dcb --- .../settings/device/DockFragmentActivity.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/DockFragmentActivity.java b/DeviceSettings/src/com/cyanogenmod/settings/device/DockFragmentActivity.java index 4591825e..4504dd71 100644 --- a/DeviceSettings/src/com/cyanogenmod/settings/device/DockFragmentActivity.java +++ b/DeviceSettings/src/com/cyanogenmod/settings/device/DockFragmentActivity.java @@ -21,6 +21,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; +import android.os.UserHandle; import android.preference.CheckBoxPreference; import android.preference.Preference; import android.preference.PreferenceActivity; @@ -42,7 +43,6 @@ public void onCreate(Bundle savedInstanceState) { addPreferencesFromResource(R.xml.dock_preferences); PreferenceScreen prefSet = getPreferenceScreen(); - } @Override @@ -57,9 +57,8 @@ public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preferen boxValue = (((CheckBoxPreference)preference).isChecked() ? "1" : "0"); Intent i = new Intent("com.cyanogenmod.settings.SamsungDock"); i.putExtra("data", boxValue); - ActivityManagerNative.broadcastStickyIntent(i, null); + ActivityManagerNative.broadcastStickyIntent(i, null, UserHandle.USER_ALL); } - return true; } @@ -68,8 +67,6 @@ public static void restore(Context context) { boolean dockAudio = sharedPrefs.getBoolean(DeviceSettings.KEY_USE_DOCK_AUDIO, false); Intent i = new Intent("com.cyanogenmod.settings.SamsungDock"); i.putExtra("data", (dockAudio? "1" : "0")); - ActivityManagerNative.broadcastStickyIntent(i, null); - + ActivityManagerNative.broadcastStickyIntent(i, null, UserHandle.USER_ALL); } - } From b960903dd5ec98c2dd036c33d438e02556fda60b Mon Sep 17 00:00:00 2001 From: codeworkx Date: Mon, 10 Dec 2012 20:40:34 +0100 Subject: [PATCH 17/52] i9100: enable powerwidgets Change-Id: I09447cdfe9a04917b39fda7500728a1bb5c45dcb --- .../apps/Settings/res/values/bools.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 overlay/packages/apps/Settings/res/values/bools.xml diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml new file mode 100644 index 00000000..7fa29810 --- /dev/null +++ b/overlay/packages/apps/Settings/res/values/bools.xml @@ -0,0 +1,19 @@ + + + + + true + From 122bcb6beb235b488982f87dd946b3127d8dc30a Mon Sep 17 00:00:00 2001 From: codeworkx Date: Tue, 11 Dec 2012 19:13:42 +0100 Subject: [PATCH 18/52] i9100: reenable hardwarekeys overlay Change-Id: Ia2c8f7306e027a323229aadafc027d42000852eb --- overlay/frameworks/base/core/res/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 0c4526b2..14302773 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -152,7 +152,7 @@ 16 - App switch For example, a device with Home, Back and Menu keys would set this config to 7. --> - + 7 From 09cba271b6222c0d8b64de2fdf5d445ea7789eab Mon Sep 17 00:00:00 2001 From: codeworkx Date: Tue, 11 Dec 2012 19:15:53 +0100 Subject: [PATCH 19/52] i9100: reduce height of keyguard status view Change-Id: I7acd8834d87553cbc1bfe5638dc36aaf4f0f5688 --- .../base/core/res/res/values/dimens.xml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 overlay/frameworks/base/core/res/res/values/dimens.xml diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/overlay/frameworks/base/core/res/res/values/dimens.xml new file mode 100644 index 00000000..f6d787e6 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -0,0 +1,25 @@ + + + + + + 348dp + + From 781c4a09cf62796aa00027929abc4362a13ccb41 Mon Sep 17 00:00:00 2001 From: Andrew Jiang Date: Tue, 11 Dec 2012 17:18:58 -0500 Subject: [PATCH 20/52] I9100: Enable Home Button Unlock Enable the home button unlock feature. Change-Id: Id4e8f116cb55cf3b920d896b3f0a0591cf27ca5f --- overlay/frameworks/base/core/res/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 14302773..a4ef745e 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -155,6 +155,6 @@ 7 - + false From 7703b3485f7771ed9bc9c0a0e06e76bc26e9c76b Mon Sep 17 00:00:00 2001 From: codeworkx Date: Sat, 15 Dec 2012 18:17:10 +0100 Subject: [PATCH 21/52] i9100: cleanup proprietary files Change-Id: I109ae08305505dcf519d273fd3869a1aca977e3d --- proprietary-common-files.txt | 46 ------------------------------------ proprietary-files.sh | 32 ++++++++++++------------- 2 files changed, 16 insertions(+), 62 deletions(-) diff --git a/proprietary-common-files.txt b/proprietary-common-files.txt index f4b5fecb..5d01b39f 100644 --- a/proprietary-common-files.txt +++ b/proprietary-common-files.txt @@ -1,47 +1,3 @@ -system/etc/audio/LVVEFS_Rx_Configuration.txt -system/etc/audio/LVVEFS_Tx_Configuration.txt -system/etc/audio/Rx_ControlParams_BLUETOOTH_HEADSET.txt -system/etc/audio/Rx_ControlParams_EARPIECE_WIDEBAND.txt -system/etc/audio/Rx_ControlParams_SPEAKER_WIDEBAND.txt -system/etc/audio/Rx_ControlParams_WIRED_HEADPHONE_WIDEBAND.txt -system/etc/audio/Rx_ControlParams_WIRED_HEADSET_WIDEBAND.txt -system/etc/audio/Tx_ControlParams_BLUETOOTH_HEADSET.txt -system/etc/audio/Tx_ControlParams_EARPIECE_WIDEBAND.txt -system/etc/audio/Tx_ControlParams_SPEAKER_WIDEBAND.txt -system/etc/audio/Tx_ControlParams_WIRED_HEADPHONE_WIDEBAND.txt -system/etc/audio/Tx_ControlParams_WIRED_HEADSET_WIDEBAND.txt -system/lib/hw/alsa.default.so -system/lib/hw/audio.primary.exynos4.so -system/lib/hw/audio_policy.exynos4.so -system/lib/lib_Samsung_Acoustic_Module_Llite.so -system/lib/lib_Samsung_Resampler.so -system/lib/lib_Samsung_Sound_Booster.so -system/lib/libasound.so -system/lib/liblvvefs.so -system/lib/libmediayamaha.so -system/lib/libmediayamaha_jni.so -system/lib/libmediayamaha_tuning_jni.so -system/lib/libmediayamahaservice.so -system/lib/libsamsungAcousticeq.so -system/lib/libsamsungSoundbooster.so -system/lib/libyamahasrc.so -system/usr/share/alsa/alsa.conf -system/usr/share/alsa/cards/aliases.conf -system/usr/share/alsa/pcm/center_lfe.conf -system/usr/share/alsa/pcm/default.conf -system/usr/share/alsa/pcm/dmix.conf -system/usr/share/alsa/pcm/dpl.conf -system/usr/share/alsa/pcm/dsnoop.conf -system/usr/share/alsa/pcm/front.conf -system/usr/share/alsa/pcm/iec958.conf -system/usr/share/alsa/pcm/modem.conf -system/usr/share/alsa/pcm/rear.conf -system/usr/share/alsa/pcm/side.conf -system/usr/share/alsa/pcm/surround40.conf -system/usr/share/alsa/pcm/surround41.conf -system/usr/share/alsa/pcm/surround50.conf -system/usr/share/alsa/pcm/surround51.conf -system/usr/share/alsa/pcm/surround71.conf system/cameradata/datapattern_420sp.yuv system/cameradata/datapattern_front_420sp.yuv system/lib/libcaps.so @@ -49,7 +5,6 @@ system/vendor/firmware/mfc_fw.bin system/lib/egl/libEGL_mali.so system/lib/egl/libGLESv1_CM_mali.so system/lib/egl/libGLESv2_mali.so -system/lib/hw/gralloc.exynos4.so system/lib/libMali.so system/lib/libUMP.so system/lib/libsecion.so @@ -64,5 +19,4 @@ system/lib/libhdmiclient.so system/lib/libtvout_jni.so system/lib/libtvoutinterface.so system/lib/libtvoutservice.so -system/lib/hw/hwcomposer.smdk4210.so system/vendor/firmware/libpn544_fw.so diff --git a/proprietary-files.sh b/proprietary-files.sh index 650ffa81..488c9bd4 100755 --- a/proprietary-files.sh +++ b/proprietary-files.sh @@ -60,12 +60,12 @@ done # limitations under the License. PRODUCT_PACKAGES += \\ - libTVOut \\ - libfimc \\ - libhdmi \\ - libhdmiclient \\ - libmediayamahaservice \\ - libsecion + libTVOut \\ + libUMP \\ + libfimc \\ + libhdmi \\ + libhdmiclient \\ + libsecion PRODUCT_COPY_FILES += \\ vendor/__VENDOR__/__COMMON__/proprietary/system/lib/hw/camera.exynos4.so:system/lib/hw/vendor-camera.exynos4.so \\ @@ -111,9 +111,9 @@ LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -LOCAL_MODULE := libsecion +LOCAL_MODULE := libUMP LOCAL_MODULE_OWNER := samsung -LOCAL_SRC_FILES := system/lib/libsecion.so +LOCAL_SRC_FILES := system/lib/libUMP.so LOCAL_MODULE_TAGS := optional LOCAL_MODULE_SUFFIX := .so LOCAL_MODULE_CLASS := SHARED_LIBRARIES @@ -121,9 +121,9 @@ LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -LOCAL_MODULE := libfimc +LOCAL_MODULE := libsecion LOCAL_MODULE_OWNER := samsung -LOCAL_SRC_FILES := system/lib/libfimc.so +LOCAL_SRC_FILES := system/lib/libsecion.so LOCAL_MODULE_TAGS := optional LOCAL_MODULE_SUFFIX := .so LOCAL_MODULE_CLASS := SHARED_LIBRARIES @@ -131,9 +131,9 @@ LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -LOCAL_MODULE := libhdmi +LOCAL_MODULE := libfimc LOCAL_MODULE_OWNER := samsung -LOCAL_SRC_FILES := system/lib/libhdmi.so +LOCAL_SRC_FILES := system/lib/libfimc.so LOCAL_MODULE_TAGS := optional LOCAL_MODULE_SUFFIX := .so LOCAL_MODULE_CLASS := SHARED_LIBRARIES @@ -141,9 +141,9 @@ LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -LOCAL_MODULE := libhdmiclient +LOCAL_MODULE := libhdmi LOCAL_MODULE_OWNER := samsung -LOCAL_SRC_FILES := system/lib/libhdmiclient.so +LOCAL_SRC_FILES := system/lib/libhdmi.so LOCAL_MODULE_TAGS := optional LOCAL_MODULE_SUFFIX := .so LOCAL_MODULE_CLASS := SHARED_LIBRARIES @@ -151,9 +151,9 @@ LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -LOCAL_MODULE := libmediayamahaservice +LOCAL_MODULE := libhdmiclient LOCAL_MODULE_OWNER := samsung -LOCAL_SRC_FILES := system/lib/libmediayamahaservice.so +LOCAL_SRC_FILES := system/lib/libhdmiclient.so LOCAL_MODULE_TAGS := optional LOCAL_MODULE_SUFFIX := .so LOCAL_MODULE_CLASS := SHARED_LIBRARIES From c40911dd9de4d090d7c7bfd899cfc364e27ab8e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Espen=20Fjellv=C3=A6r=20Olsen?= Date: Sun, 13 Jan 2013 19:53:01 +0100 Subject: [PATCH 22/52] Use common files/script for blobs Change-Id: I7097d5abb65944d62d067f92a9518298fdbdf831 --- extract-files.sh | 114 ++++++++ proprietary-common-files.txt | 22 -- proprietary-files.sh | 259 ------------------ ...y-i9100-files.txt => proprietary-files.txt | 0 4 files changed, 114 insertions(+), 281 deletions(-) create mode 100755 extract-files.sh delete mode 100644 proprietary-common-files.txt delete mode 100755 proprietary-files.sh rename proprietary-i9100-files.txt => proprietary-files.txt (100%) diff --git a/extract-files.sh b/extract-files.sh new file mode 100755 index 00000000..68d597f2 --- /dev/null +++ b/extract-files.sh @@ -0,0 +1,114 @@ +#!/bin/sh + +# Copyright (C) 2012 The CyanogenMod Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +VENDOR=samsung +DEVICE=i9100 +DEVICEOUTDIR=vendor/$VENDOR/$DEVICE +DEVICEBASE=../../../$DEVICEOUTDIR/proprietary +DEVICEMAKEFILE=../../../$DEVICEOUTDIR/$DEVICE-vendor-blobs.mk +COMMONPROPS=../galaxys2-common/proprietary-files.txt +adb root +adb wait-for-device + +echo "Pulling device specific files..." +for FILE in `cat proprietary-files.txt | grep -v ^# | grep -v ^$`; do + DIR=`dirname $FILE` + if [ ! -d $DEVICEBASE/$DIR ]; then + mkdir -p $DEVICEBASE/$DIR + fi + adb pull /$FILE $DEVICEBASE/$FILE +done +adb pull /system/lib/hw/vendor-camera.exynos4.so $DEVICEBASE/system/lib/hw/camera.exynos4.so + + +(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__VENDOR__/$VENDOR/g > $DEVICEMAKEFILE +# Copyright (C) 2012 The CyanogenMod Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Prebuilt libraries that are needed to build open-source libraries +PRODUCT_COPY_FILES := \\ + vendor/__VENDOR__/__DEVICE__/proprietary/system/lib/libril.so:obj/lib/libril.so \\ + vendor/__VENDOR__/__DEVICE__/proprietary/system/lib/libsecril-client.so:obj/lib/libsecril-client.so + +PRODUCT_COPY_FILES += \\ + vendor/__VENDOR__/__DEVICE__/proprietary/system/lib/hw/camera.exynos4.so:system/lib/hw/vendor-camera.exynos4.so + +PRODUCT_COPY_FILES += \\ +EOF + +LINEEND=" \\" +COUNT=`cat proprietary-files.txt | grep -v ^# | grep -v ^$ | wc -l | awk {'print $1'}` +for FILE in `cat proprietary-files.txt | grep -v ^# | grep -v ^$`; do + COUNT=`expr $COUNT - 1` + if [ $COUNT = "0" ]; then + LINEEND="" + fi + echo " $DEVICEOUTDIR/proprietary/$FILE:$FILE$LINEEND" >> $DEVICEMAKEFILE +done + + +(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__VENDOR__/$VENDOR/g > ../../../$DEVICEOUTDIR/BoardConfigVendor.mk +# Copyright (C) 2012 The CyanogenMod Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +USE_CAMERA_STUB := false +BOARD_USES_GENERIC_AUDIO := false +EOF + +(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__VENDOR__/$VENDOR/g > ../../../$DEVICEOUTDIR/$DEVICE-vendor.mk +# Copyright (C) 2012 The CyanogenMod Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Pick up overlay for features that depend on non-open-source files +DEVICE_PACKAGE_OVERLAYS += vendor/__VENDOR__/__DEVICE__/overlay + +\$(call inherit-product, vendor/__VENDOR__/__DEVICE__/__DEVICE__-vendor-blobs.mk) +EOF + +./../../../device/samsung/galaxys2-common/extract-files.sh diff --git a/proprietary-common-files.txt b/proprietary-common-files.txt deleted file mode 100644 index 5d01b39f..00000000 --- a/proprietary-common-files.txt +++ /dev/null @@ -1,22 +0,0 @@ -system/cameradata/datapattern_420sp.yuv -system/cameradata/datapattern_front_420sp.yuv -system/lib/libcaps.so -system/vendor/firmware/mfc_fw.bin -system/lib/egl/libEGL_mali.so -system/lib/egl/libGLESv1_CM_mali.so -system/lib/egl/libGLESv2_mali.so -system/lib/libMali.so -system/lib/libUMP.so -system/lib/libsecion.so -system/bin/bintvoutservice -system/lib/libTVOut.so -system/lib/libcec.so -system/lib/libddc.so -system/lib/libedid.so -system/lib/libfimc.so -system/lib/libhdmi.so -system/lib/libhdmiclient.so -system/lib/libtvout_jni.so -system/lib/libtvoutinterface.so -system/lib/libtvoutservice.so -system/vendor/firmware/libpn544_fw.so diff --git a/proprietary-files.sh b/proprietary-files.sh deleted file mode 100755 index 488c9bd4..00000000 --- a/proprietary-files.sh +++ /dev/null @@ -1,259 +0,0 @@ -#!/bin/sh - -# Copyright (C) 2012 The CyanogenMod Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -VENDOR=samsung -COMMON=galaxys2-common -DEVICE=i9100 -COMMONOUTDIR=vendor/$VENDOR/$COMMON -COMMONBASE=../../../$COMMONOUTDIR/proprietary -COMMONMAKEFILE=../../../$COMMONOUTDIR/common-vendor-blobs.mk -DEVICEOUTDIR=vendor/$VENDOR/$DEVICE -DEVICEBASE=../../../$DEVICEOUTDIR/proprietary -DEVICEMAKEFILE=../../../$DEVICEOUTDIR/$DEVICE-vendor-blobs.mk - -echo "Pulling common files..." -for FILE in `cat proprietary-common-files.txt | grep -v ^# | grep -v ^$`; do - DIR=`dirname $FILE` - if [ ! -d $COMMONBASE/$DIR ]; then - mkdir -p $COMMONBASE/$DIR - fi - adb pull /$FILE $COMMONBASE/$FILE -done - -adb pull /system/lib/hw/vendor-camera.exynos4.so $COMMONBASE/system/lib/hw/camera.exynos4.so - -echo "Pulling device specific files..." -for FILE in `cat proprietary-$DEVICE-files.txt | grep -v ^# | grep -v ^$`; do - DIR=`dirname $FILE` - if [ ! -d $DEVICEBASE/$DIR ]; then - mkdir -p $DEVICEBASE/$DIR - fi - adb pull /$FILE $DEVICEBASE/$FILE -done - -(cat << EOF) | sed s/__COMMON__/$COMMON/g | sed s/__DEVICE__/$DEVICE/g | sed s/__VENDOR__/$VENDOR/g > $COMMONMAKEFILE -# Copyright (C) 2012 The CyanogenMod Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -PRODUCT_PACKAGES += \\ - libTVOut \\ - libUMP \\ - libfimc \\ - libhdmi \\ - libhdmiclient \\ - libsecion - -PRODUCT_COPY_FILES += \\ - vendor/__VENDOR__/__COMMON__/proprietary/system/lib/hw/camera.exynos4.so:system/lib/hw/vendor-camera.exynos4.so \\ -EOF - -LINEEND=" \\" -COUNT=`cat proprietary-common-files.txt | grep -v ^# | grep -v ^$ | wc -l | awk {'print $1'}` -for FILE in `cat proprietary-common-files.txt | grep -v ^# | grep -v ^$`; do - COUNT=`expr $COUNT - 1` - if [ $COUNT = "0" ]; then - LINEEND="" - fi - echo " $COMMONOUTDIR/proprietary/$FILE:$FILE$LINEEND" >> $COMMONMAKEFILE -done - -(cat << EOF) | sed s/__COMMON__/$COMMON/g | sed s/__DEVICE__/$DEVICE/g | sed s/__VENDOR__/$VENDOR/g > $COMMONBASE/Android.mk -# Copyright (C) 2012 The CyanogenMod Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := \$(call my-dir) - -ifneq (\$(filter i777 i9100 n7000,\$(TARGET_DEVICE)),) - -include \$(CLEAR_VARS) -LOCAL_MODULE := libTVOut -LOCAL_MODULE_OWNER := samsung -LOCAL_SRC_FILES := system/lib/libTVOut.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib -include \$(BUILD_PREBUILT) - -include \$(CLEAR_VARS) -LOCAL_MODULE := libUMP -LOCAL_MODULE_OWNER := samsung -LOCAL_SRC_FILES := system/lib/libUMP.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib -include \$(BUILD_PREBUILT) - -include \$(CLEAR_VARS) -LOCAL_MODULE := libsecion -LOCAL_MODULE_OWNER := samsung -LOCAL_SRC_FILES := system/lib/libsecion.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib -include \$(BUILD_PREBUILT) - -include \$(CLEAR_VARS) -LOCAL_MODULE := libfimc -LOCAL_MODULE_OWNER := samsung -LOCAL_SRC_FILES := system/lib/libfimc.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib -include \$(BUILD_PREBUILT) - -include \$(CLEAR_VARS) -LOCAL_MODULE := libhdmi -LOCAL_MODULE_OWNER := samsung -LOCAL_SRC_FILES := system/lib/libhdmi.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib -include \$(BUILD_PREBUILT) - -include \$(CLEAR_VARS) -LOCAL_MODULE := libhdmiclient -LOCAL_MODULE_OWNER := samsung -LOCAL_SRC_FILES := system/lib/libhdmiclient.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib -include \$(BUILD_PREBUILT) - -endif - -EOF - -(cat << EOF) | sed s/__COMMON__/$COMMON/g | sed s/__DEVICE__/$DEVICE/g | sed s/__VENDOR__/$VENDOR/g > $DEVICEMAKEFILE -# Copyright (C) 2012 The CyanogenMod Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Prebuilt libraries that are needed to build open-source libraries -PRODUCT_COPY_FILES := \\ - vendor/__VENDOR__/__DEVICE__/proprietary/system/lib/libril.so:obj/lib/libril.so \\ - vendor/__VENDOR__/__DEVICE__/proprietary/system/lib/libsecril-client.so:obj/lib/libsecril-client.so - -PRODUCT_COPY_FILES += \\ -EOF - -LINEEND=" \\" -COUNT=`cat proprietary-$DEVICE-files.txt | grep -v ^# | grep -v ^$ | wc -l | awk {'print $1'}` -for FILE in `cat proprietary-$DEVICE-files.txt | grep -v ^# | grep -v ^$`; do - COUNT=`expr $COUNT - 1` - if [ $COUNT = "0" ]; then - LINEEND="" - fi - echo " $DEVICEOUTDIR/proprietary/$FILE:$FILE$LINEEND" >> $DEVICEMAKEFILE -done - -(cat << EOF) | sed s/__COMMON__/$COMMON/g | sed s/__DEVICE__/$DEVICE/g | sed s/__VENDOR__/$VENDOR/g > ../../../$COMMONOUTDIR/common-vendor.mk -# Copyright (C) 2012 The CyanogenMod Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Pick up overlay for features that depend on non-open-source files -DEVICE_PACKAGE_OVERLAYS += vendor/__VENDOR__/__COMMON__/overlay - -\$(call inherit-product, vendor/__VENDOR__/__COMMON__/common-vendor-blobs.mk) -EOF - -(cat << EOF) | sed s/__COMMON__/$COMMON/g | sed s/__DEVICE__/$DEVICE/g | sed s/__VENDOR__/$VENDOR/g > ../../../$DEVICEOUTDIR/BoardConfigVendor.mk -# Copyright (C) 2012 The CyanogenMod Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -USE_CAMERA_STUB := false -BOARD_USES_GENERIC_AUDIO := false -EOF - -(cat << EOF) | sed s/__COMMON__/$COMMON/g | sed s/__DEVICE__/$DEVICE/g | sed s/__VENDOR__/$VENDOR/g > ../../../$DEVICEOUTDIR/$DEVICE-vendor.mk -# Copyright (C) 2012 The CyanogenMod Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Pick up overlay for features that depend on non-open-source files -DEVICE_PACKAGE_OVERLAYS += vendor/__VENDOR__/__DEVICE__/overlay - -\$(call inherit-product, vendor/__VENDOR__/__DEVICE__/__DEVICE__-vendor-blobs.mk) -EOF diff --git a/proprietary-i9100-files.txt b/proprietary-files.txt similarity index 100% rename from proprietary-i9100-files.txt rename to proprietary-files.txt From 7464a161487845e28907a670483f022c29ff5239 Mon Sep 17 00:00:00 2001 From: pvolkov Date: Wed, 23 Jan 2013 19:39:19 +0400 Subject: [PATCH 23/52] Update Russian Translation-Galaxy S II Settings-CM10.1 Update Russian Translation-Fix typos Update Russian Translation-Fix typos Update Russian Translation-Fix typos Update Russian Translation-Update some strings --- DeviceSettings/res/values-ru/arrays.xml | 68 ++++++++++++++++++++++++ DeviceSettings/res/values-ru/strings.xml | 50 +++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 DeviceSettings/res/values-ru/arrays.xml create mode 100644 DeviceSettings/res/values-ru/strings.xml diff --git a/DeviceSettings/res/values-ru/arrays.xml b/DeviceSettings/res/values-ru/arrays.xml new file mode 100644 index 00000000..074cedbc --- /dev/null +++ b/DeviceSettings/res/values-ru/arrays.xml @@ -0,0 +1,68 @@ + + + + Камера (По умолч.) + Видео + Видео (тёпл.) + Видео (хол.) + Интерфейс + Навигация + Галерея + VT + + + + Стандартный (По умолчанию) + Динамический + Естественный + Кино + + + + Выкл. (По умолчанию) + Вкл. + + + + Выкл. (По умолчанию) + Вкл. + + + + 2.2 (По умолчанию) + 1.9 + + + + 10 + 20 + 30 + 50 (По умолчанию) + 70 + 100 + + + + 0% + 25% + 50% (По умолчанию) + 75% + 100% + + + + Только UMTS + Только HSDPA + HSDPA + HSUPA + + + + Никогда + 1 секунда + 2 секунды + 3 секунды (По умолчанию) + 4 секунды + 5 секунд + 6 секунд + + diff --git a/DeviceSettings/res/values-ru/strings.xml b/DeviceSettings/res/values-ru/strings.xml new file mode 100644 index 00000000..e444fd57 --- /dev/null +++ b/DeviceSettings/res/values-ru/strings.xml @@ -0,0 +1,50 @@ + + + Настройки Galaxy S II + + Экран + Цвета + Сценарий + Установка сценария mDNIe + Режим + Установка режима mDNIe + Инверсия + Включить/Выключить инверсию цветов + Повышенная яркость + Включить/Выключить режим повышенной яркости + Гамма + Установка значения цветовой гаммы + + Сенсорный экран + Чувствительность + Установка чувствительности сенсорного экрана + + Сенсорные кнопки + Подсветка кнопок + Включать подсветку сенсорных кнопок при включённом экране + Тайм-аут подсветки + Время до выключения подсветки после последнего нажатия на кнопки + + Датчики + Акселерометр + Использовать данные калибровки + Использовать откалиброванные значения. Необходимо выполнить калибровку! + Калибровка + Положите телефон на ровную поверхность и нажмите эту кнопку. + Калибровка выполнена + Датчик успешно откалиброван + + Отклик + Вибрация + Интенсивность вибрации + Установка интенсивности вибрации + + Модем + HSPA + Включить HSDPA/HSUPA + + Док-станция + Аудио + USB аудио док-станция + Использовать пассивный режим аудио док-станции + From 79230b71742264fbc161cd144e4a584e298dcd1f Mon Sep 17 00:00:00 2001 From: meviox Date: Mon, 28 Jan 2013 22:30:31 +0100 Subject: [PATCH 24/52] Settings: Fix a typo in the German translation * Settings > Device > Advanced > Sensors > Accelerometer: - "Kalibierungsdaten" -> "Kalibrierungsdaten" Signed-off-by: meviox --- DeviceSettings/res/values-de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DeviceSettings/res/values-de/strings.xml b/DeviceSettings/res/values-de/strings.xml index a4365e90..c1449899 100644 --- a/DeviceSettings/res/values-de/strings.xml +++ b/DeviceSettings/res/values-de/strings.xml @@ -27,7 +27,7 @@ Sensoren Beschleunigungssensor - Kalibierungsdaten + Kalibrierungsdaten Kalibrierungswerte verwenden\nNach Aktivierung bitte Kalibrierung ausführen Kalibrieren Sensor kalibrieren\nZum Starten das Telefon auf eine horizontale, ebene Fläche legen From cf2c95eef4be5e312e2310f38424fba4575a9462 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Sun, 27 Jan 2013 09:18:14 +0000 Subject: [PATCH 25/52] i9100: keyfiles and extract cleanup Change-Id: Ic1c9a6ff3364f7d37577144ba805bbbae7350ef6 --- i9100.mk | 21 +- proprietary-files.txt | 17 - usr/idc/qwerty.idc | 28 - usr/idc/qwerty2.idc | 28 - usr/keychars/Generic.kcm | 672 ---------------------- usr/keychars/Virtual.kcm | 544 ------------------ usr/keychars/qwerty.kcm | 508 ---------------- usr/keychars/qwerty2.kcm | 505 ---------------- usr/keylayout/AVRCP.kl | 23 - usr/keylayout/Generic.kl | 421 -------------- usr/keylayout/Vendor_045e_Product_028e.kl | 46 -- usr/keylayout/Vendor_046d_Product_c216.kl | 37 -- usr/keylayout/Vendor_046d_Product_c294.kl | 53 -- usr/keylayout/Vendor_046d_Product_c299.kl | 62 -- usr/keylayout/Vendor_046d_Product_c532.kl | 133 ----- usr/keylayout/Vendor_054c_Product_0268.kl | 76 --- usr/keylayout/Vendor_05ac_Product_0239.kl | 119 ---- usr/keylayout/Vendor_22b8_Product_093d.kl | 105 ---- usr/keylayout/gpio-keys.kl | 13 +- usr/keylayout/qwerty.kl | 112 ---- usr/keylayout/sii9234_rcp.kl | 28 + 21 files changed, 32 insertions(+), 3519 deletions(-) delete mode 100644 usr/idc/qwerty.idc delete mode 100644 usr/idc/qwerty2.idc delete mode 100644 usr/keychars/Generic.kcm delete mode 100644 usr/keychars/Virtual.kcm delete mode 100644 usr/keychars/qwerty.kcm delete mode 100644 usr/keychars/qwerty2.kcm delete mode 100644 usr/keylayout/AVRCP.kl delete mode 100644 usr/keylayout/Generic.kl delete mode 100644 usr/keylayout/Vendor_045e_Product_028e.kl delete mode 100644 usr/keylayout/Vendor_046d_Product_c216.kl delete mode 100644 usr/keylayout/Vendor_046d_Product_c294.kl delete mode 100644 usr/keylayout/Vendor_046d_Product_c299.kl delete mode 100644 usr/keylayout/Vendor_046d_Product_c532.kl delete mode 100644 usr/keylayout/Vendor_054c_Product_0268.kl delete mode 100644 usr/keylayout/Vendor_05ac_Product_0239.kl delete mode 100644 usr/keylayout/Vendor_22b8_Product_093d.kl delete mode 100644 usr/keylayout/qwerty.kl create mode 100644 usr/keylayout/sii9234_rcp.kl diff --git a/i9100.mk b/i9100.mk index edab9c30..fc1a3a66 100644 --- a/i9100.mk +++ b/i9100.mk @@ -40,37 +40,18 @@ PRODUCT_PACKAGES += \ # Keylayout PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/usr/keylayout/AVRCP.kl:system/usr/keylayout/AVRCP.kl \ - $(LOCAL_PATH)/usr/keylayout/Generic.kl:system/usr/keylayout/Generic.kl \ $(LOCAL_PATH)/usr/keylayout/gpio-keys.kl:system/usr/keylayout/gpio-keys.kl \ $(LOCAL_PATH)/usr/keylayout/max8997-muic.kl:system/usr/keylayout/max8997-muic.kl \ $(LOCAL_PATH)/usr/keylayout/melfas-touchkey.kl:system/usr/keylayout/melfas-touchkey.kl \ - $(LOCAL_PATH)/usr/keylayout/qwerty.kl:system/usr/keylayout/qwerty.kl \ $(LOCAL_PATH)/usr/keylayout/samsung-keypad.kl:system/usr/keylayout/samsung-keypad.kl \ $(LOCAL_PATH)/usr/keylayout/sec_key.kl:system/usr/keylayout/sec_key.kl \ $(LOCAL_PATH)/usr/keylayout/sec_touchkey.kl:system/usr/keylayout/sec_touchkey.kl \ - $(LOCAL_PATH)/usr/keylayout/Vendor_05ac_Product_0239.kl:system/usr/keylayout/Vendor_05ac_Product_0239.kl \ - $(LOCAL_PATH)/usr/keylayout/Vendor_22b8_Product_093d.kl:system/usr/keylayout/Vendor_22b8_Product_093d.kl \ - $(LOCAL_PATH)/usr/keylayout/Vendor_045e_Product_028e.kl:system/usr/keylayout/Vendor_045e_Product_028e.kl \ - $(LOCAL_PATH)/usr/keylayout/Vendor_046d_Product_c216.kl:system/usr/keylayout/Vendor_046d_Product_c216.kl \ - $(LOCAL_PATH)/usr/keylayout/Vendor_046d_Product_c294.kl:system/usr/keylayout/Vendor_046d_Product_c294.kl \ - $(LOCAL_PATH)/usr/keylayout/Vendor_046d_Product_c299.kl:system/usr/keylayout/Vendor_046d_Product_c299.kl \ - $(LOCAL_PATH)/usr/keylayout/Vendor_046d_Product_c532.kl:system/usr/keylayout/Vendor_046d_Product_c532.kl \ - $(LOCAL_PATH)/usr/keylayout/Vendor_054c_Product_0268.kl:system/usr/keylayout/Vendor_054c_Product_0268.kl - -# Keychars -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/usr/keychars/Generic.kcm:system/usr/keychars/Generic.kcm \ - $(LOCAL_PATH)/usr/keychars/qwerty.kcm:system/usr/keychars/qwerty.kcm \ - $(LOCAL_PATH)/usr/keychars/qwerty2.kcm:system/usr/keychars/qwerty2.kcm \ - $(LOCAL_PATH)/usr/keychars/Virtual.kcm:system/usr/keychars/Virtual.kcm + $(LOCAL_PATH)/usr/keylayout/sii9234_rcp.kl:system/usr/keylayout/sii9234_rcp.kl # Idc PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/usr/idc/melfas_ts.idc:system/usr/idc/melfas_ts.idc \ $(LOCAL_PATH)/usr/idc/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc \ - $(LOCAL_PATH)/usr/idc/qwerty.idc:system/usr/idc/qwerty.idc \ - $(LOCAL_PATH)/usr/idc/qwerty2.idc:system/usr/idc/qwerty2.idc \ $(LOCAL_PATH)/usr/idc/sec_touchscreen.idc:system/usr/idc/sec_touchscreen.idc $(call inherit-product-if-exists, vendor/samsung/i9100/i9100-vendor.mk) diff --git a/proprietary-files.txt b/proprietary-files.txt index 4a3d10bf..6d73bee8 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -3,21 +3,4 @@ system/lib/libril.so system/lib/libsec-ril.so system/lib/libsecril-client.so system/lib/hw/gps.exynos4.so -system/bin/bcm4330B1.hcd -system/etc/wifi/bcm4330_apsta.bin -system/etc/wifi/bcm4330_mfg.bin -system/etc/wifi/bcm4330_p2p.bin -system/etc/wifi/bcm4330_sta.bin -system/etc/wifi/nvram_mfg.txt -system/etc/wifi/nvram_mfg.txt_murata -system/etc/wifi/nvram_net.txt -system/etc/wifi/nvram_net.txt_AU -system/etc/wifi/nvram_net.txt_IL -system/etc/wifi/nvram_net.txt_SG -system/etc/wifi/nvram_net.txt_TN -system/etc/wifi/nvram_net.txt_murata -system/etc/wifi/nvram_net.txt_murata_AU -system/etc/wifi/nvram_net.txt_murata_IL -system/etc/wifi/nvram_net.txt_murata_SG -system/etc/wifi/nvram_net.txt_murata_TN system/lib/libakm.so diff --git a/usr/idc/qwerty.idc b/usr/idc/qwerty.idc deleted file mode 100644 index 375d7857..00000000 --- a/usr/idc/qwerty.idc +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) 2010 The Android Open Source 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. - -# -# Emulator keyboard configuration file #1. -# - -touch.deviceType = touchScreen -touch.orientationAware = 1 - -keyboard.layout = qwerty -keyboard.characterMap = qwerty -keyboard.orientationAware = 1 -keyboard.builtIn = 1 - -cursor.mode = navigation -cursor.orientationAware = 1 diff --git a/usr/idc/qwerty2.idc b/usr/idc/qwerty2.idc deleted file mode 100644 index 369205ea..00000000 --- a/usr/idc/qwerty2.idc +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) 2010 The Android Open Source 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. - -# -# Emulator keyboard configuration file #2. -# - -touch.deviceType = touchScreen -touch.orientationAware = 1 - -keyboard.layout = qwerty -keyboard.characterMap = qwerty2 -keyboard.orientationAware = 1 -keyboard.builtIn = 1 - -cursor.mode = navigation -cursor.orientationAware = 1 diff --git a/usr/keychars/Generic.kcm b/usr/keychars/Generic.kcm deleted file mode 100644 index b5f68971..00000000 --- a/usr/keychars/Generic.kcm +++ /dev/null @@ -1,672 +0,0 @@ -# Copyright (C) 2010 The Android Open Source 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. - -# -# Generic key character map for full alphabetic US English PC style external keyboards. -# -# This file is intentionally very generic and is intended to support a broad rang of keyboards. -# Do not edit the generic key character map to support a specific keyboard; instead, create -# a new key character map file with the required keyboard configuration. -# - -type FULL - -### Basic QWERTY keys ### - -key A { - label: 'A' - base: 'a' - shift, capslock: 'A' - ctrl, alt, meta: none -} - -key B { - label: 'B' - base: 'b' - shift, capslock: 'B' - ctrl, alt, meta: none -} - -key C { - label: 'C' - base: 'c' - shift, capslock: 'C' - alt: '\u00e7' - shift+alt: '\u00c7' - ctrl, meta: none -} - -key D { - label: 'D' - base: 'd' - shift, capslock: 'D' - ctrl, alt, meta: none -} - -key E { - label: 'E' - base: 'e' - shift, capslock: 'E' - alt: '\u0301' - ctrl, meta: none -} - -key F { - label: 'F' - base: 'f' - shift, capslock: 'F' - ctrl, alt, meta: none -} - -key G { - label: 'G' - base: 'g' - shift, capslock: 'G' - ctrl, alt, meta: none -} - -key H { - label: 'H' - base: 'h' - shift, capslock: 'H' - ctrl, alt, meta: none -} - -key I { - label: 'I' - base: 'i' - shift, capslock: 'I' - alt: '\u0302' - ctrl, meta: none -} - -key J { - label: 'J' - base: 'j' - shift, capslock: 'J' - ctrl, alt, meta: none -} - -key K { - label: 'K' - base: 'k' - shift, capslock: 'K' - ctrl, alt, meta: none -} - -key L { - label: 'L' - base: 'l' - shift, capslock: 'L' - ctrl, alt, meta: none -} - -key M { - label: 'M' - base: 'm' - shift, capslock: 'M' - ctrl, alt, meta: none -} - -key N { - label: 'N' - base: 'n' - shift, capslock: 'N' - alt: '\u0303' - ctrl, meta: none -} - -key O { - label: 'O' - base: 'o' - shift, capslock: 'O' - ctrl, alt, meta: none -} - -key P { - label: 'P' - base: 'p' - shift, capslock: 'P' - ctrl, alt, meta: none -} - -key Q { - label: 'Q' - base: 'q' - shift, capslock: 'Q' - ctrl, alt, meta: none -} - -key R { - label: 'R' - base: 'r' - shift, capslock: 'R' - ctrl, alt, meta: none -} - -key S { - label: 'S' - base: 's' - shift, capslock: 'S' - alt: '\u00df' - ctrl, meta: none -} - -key T { - label: 'T' - base: 't' - shift, capslock: 'T' - ctrl, alt, meta: none -} - -key U { - label: 'U' - base: 'u' - shift, capslock: 'U' - alt: '\u0308' - ctrl, meta: none -} - -key V { - label: 'V' - base: 'v' - shift, capslock: 'V' - ctrl, alt, meta: none -} - -key W { - label: 'W' - base: 'w' - shift, capslock: 'W' - ctrl, alt, meta: none -} - -key X { - label: 'X' - base: 'x' - shift, capslock: 'X' - ctrl, alt, meta: none -} - -key Y { - label: 'Y' - base: 'y' - shift, capslock: 'Y' - ctrl, alt, meta: none -} - -key Z { - label: 'Z' - base: 'z' - shift, capslock: 'Z' - ctrl, alt, meta: none -} - -key 0 { - label, number: '0' - base: '0' - shift: ')' - ctrl, alt, meta: none -} - -key 1 { - label, number: '1' - base: '1' - shift: '!' - ctrl, alt, meta: none -} - -key 2 { - label, number: '2' - base: '2' - shift: '@' - ctrl, alt, meta: none -} - -key 3 { - label, number: '3' - base: '3' - shift: '#' - ctrl, alt, meta: none -} - -key 4 { - label, number: '4' - base: '4' - shift: '$' - ctrl, alt, meta: none -} - -key 5 { - label, number: '5' - base: '5' - shift: '%' - ctrl, alt, meta: none -} - -key 6 { - label, number: '6' - base: '6' - shift: '^' - ctrl, alt, meta: none - alt+shift: '\u0302' -} - -key 7 { - label, number: '7' - base: '7' - shift: '&' - ctrl, alt, meta: none -} - -key 8 { - label, number: '8' - base: '8' - shift: '*' - ctrl, alt, meta: none -} - -key 9 { - label, number: '9' - base: '9' - shift: '(' - ctrl, alt, meta: none -} - -key SPACE { - label: ' ' - base: ' ' - ctrl: none - alt, meta: fallback SEARCH -} - -key ENTER { - label: '\n' - base: '\n' - ctrl, alt, meta: none -} - -key TAB { - label: '\t' - base: '\t' - ctrl, alt, meta: none -} - -key COMMA { - label, number: ',' - base: ',' - shift: '<' - ctrl, alt, meta: none -} - -key PERIOD { - label, number: '.' - base: '.' - shift: '>' - ctrl, alt, meta: none -} - -key SLASH { - label, number: '/' - base: '/' - shift: '?' - ctrl, alt, meta: none -} - -key GRAVE { - label, number: '`' - base: '`' - shift: '~' - alt: '\u0300' - alt+shift: '\u0303' - ctrl, meta: none -} - -key MINUS { - label, number: '-' - base: '-' - shift: '_' - ctrl, alt, meta: none -} - -key EQUALS { - label, number: '=' - base: '=' - shift: '+' - ctrl, alt, meta: none -} - -key LEFT_BRACKET { - label, number: '[' - base: '[' - shift: '{' - ctrl, alt, meta: none -} - -key RIGHT_BRACKET { - label, number: ']' - base: ']' - shift: '}' - ctrl, alt, meta: none -} - -key BACKSLASH { - label, number: '\\' - base: '\\' - shift: '|' - ctrl, alt, meta: none -} - -key SEMICOLON { - label, number: ';' - base: ';' - shift: ':' - ctrl, alt, meta: none -} - -key APOSTROPHE { - label, number: '\'' - base: '\'' - shift: '"' - ctrl, alt, meta: none -} - -### Numeric keypad ### - -key NUMPAD_0 { - label, number: '0' - base: fallback INSERT - numlock: '0' - ctrl, alt, meta: none -} - -key NUMPAD_1 { - label, number: '1' - base: fallback MOVE_END - numlock: '1' - ctrl, alt, meta: none -} - -key NUMPAD_2 { - label, number: '2' - base: fallback DPAD_DOWN - numlock: '2' - ctrl, alt, meta: none -} - -key NUMPAD_3 { - label, number: '3' - base: fallback PAGE_DOWN - numlock: '3' - ctrl, alt, meta: none -} - -key NUMPAD_4 { - label, number: '4' - base: fallback DPAD_LEFT - numlock: '4' - ctrl, alt, meta: none -} - -key NUMPAD_5 { - label, number: '5' - base: fallback DPAD_CENTER - numlock: '5' - ctrl, alt, meta: none -} - -key NUMPAD_6 { - label, number: '6' - base: fallback DPAD_RIGHT - numlock: '6' - ctrl, alt, meta: none -} - -key NUMPAD_7 { - label, number: '7' - base: fallback MOVE_HOME - numlock: '7' - ctrl, alt, meta: none -} - -key NUMPAD_8 { - label, number: '8' - base: fallback DPAD_UP - numlock: '8' - ctrl, alt, meta: none -} - -key NUMPAD_9 { - label, number: '9' - base: fallback PAGE_UP - numlock: '9' - ctrl, alt, meta: none -} - -key NUMPAD_LEFT_PAREN { - label, number: '(' - base: '(' - ctrl, alt, meta: none -} - -key NUMPAD_RIGHT_PAREN { - label, number: ')' - base: ')' - ctrl, alt, meta: none -} - -key NUMPAD_DIVIDE { - label, number: '/' - base: '/' - ctrl, alt, meta: none -} - -key NUMPAD_MULTIPLY { - label, number: '*' - base: '*' - ctrl, alt, meta: none -} - -key NUMPAD_SUBTRACT { - label, number: '-' - base: '-' - ctrl, alt, meta: none -} - -key NUMPAD_ADD { - label, number: '+' - base: '+' - ctrl, alt, meta: none -} - -key NUMPAD_DOT { - label, number: '.' - base: fallback FORWARD_DEL - numlock: '.' - ctrl, alt, meta: none -} - -key NUMPAD_COMMA { - label, number: ',' - base: ',' - ctrl, alt, meta: none -} - -key NUMPAD_EQUALS { - label, number: '=' - base: '=' - ctrl, alt, meta: none -} - -key NUMPAD_ENTER { - label: '\n' - base: '\n' fallback ENTER - ctrl, alt, meta: none fallback ENTER -} - -### Special keys on phones ### - -key AT { - label, number: '@' - base: '@' -} - -key STAR { - label, number: '*' - base: '*' -} - -key POUND { - label, number: '#' - base: '#' -} - -key PLUS { - label, number: '+' - base: '+' -} - -### Non-printing keys ### - -key ESCAPE { - base: fallback BACK - alt, meta: fallback HOME - ctrl: fallback MENU -} - -### Gamepad buttons ### - -key BUTTON_A { - base: fallback BACK -} - -key BUTTON_B { - base: fallback BACK -} - -key BUTTON_C { - base: fallback BACK -} - -key BUTTON_X { - base: fallback DPAD_CENTER -} - -key BUTTON_Y { - base: fallback DPAD_CENTER -} - -key BUTTON_Z { - base: fallback DPAD_CENTER -} - -key BUTTON_L1 { - base: none -} - -key BUTTON_R1 { - base: none -} - -key BUTTON_L2 { - base: none -} - -key BUTTON_R2 { - base: none -} - -key BUTTON_THUMBL { - base: fallback DPAD_CENTER -} - -key BUTTON_THUMBR { - base: fallback DPAD_CENTER -} - -key BUTTON_START { - base: fallback HOME -} - -key BUTTON_SELECT { - base: fallback MENU -} - -key BUTTON_MODE { - base: fallback MENU -} - -key BUTTON_1 { - base: fallback DPAD_CENTER -} - -key BUTTON_2 { - base: fallback DPAD_CENTER -} - -key BUTTON_3 { - base: fallback DPAD_CENTER -} - -key BUTTON_4 { - base: fallback DPAD_CENTER -} - -key BUTTON_5 { - base: fallback DPAD_CENTER -} - -key BUTTON_6 { - base: fallback DPAD_CENTER -} - -key BUTTON_7 { - base: fallback DPAD_CENTER -} - -key BUTTON_8 { - base: fallback DPAD_CENTER -} - -key BUTTON_9 { - base: fallback DPAD_CENTER -} - -key BUTTON_10 { - base: fallback DPAD_CENTER -} - -key BUTTON_11 { - base: fallback DPAD_CENTER -} - -key BUTTON_12 { - base: fallback DPAD_CENTER -} - -key BUTTON_13 { - base: fallback DPAD_CENTER -} - -key BUTTON_14 { - base: fallback DPAD_CENTER -} - -key BUTTON_15 { - base: fallback DPAD_CENTER -} - -key BUTTON_16 { - base: fallback DPAD_CENTER -} diff --git a/usr/keychars/Virtual.kcm b/usr/keychars/Virtual.kcm deleted file mode 100644 index 0ce4a681..00000000 --- a/usr/keychars/Virtual.kcm +++ /dev/null @@ -1,544 +0,0 @@ -# Copyright (C) 2010 The Android Open Source 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. - -# -# Key character map for a built-in generic virtual keyboard primarily used -# for instrumentation and testing purposes. -# - -type FULL - -### Basic QWERTY keys ### - -key A { - label: 'A' - base: 'a' - shift, capslock: 'A' - ctrl, alt, meta: none -} - -key B { - label: 'B' - base: 'b' - shift, capslock: 'B' - ctrl, alt, meta: none -} - -key C { - label: 'C' - base: 'c' - shift, capslock: 'C' - alt: '\u00e7' - shift+alt: '\u00c7' - ctrl, meta: none -} - -key D { - label: 'D' - base: 'd' - shift, capslock: 'D' - ctrl, alt, meta: none -} - -key E { - label: 'E' - base: 'e' - shift, capslock: 'E' - alt: '\u0301' - ctrl, meta: none -} - -key F { - label: 'F' - base: 'f' - shift, capslock: 'F' - ctrl, alt, meta: none -} - -key G { - label: 'G' - base: 'g' - shift, capslock: 'G' - ctrl, alt, meta: none -} - -key H { - label: 'H' - base: 'h' - shift, capslock: 'H' - ctrl, alt, meta: none -} - -key I { - label: 'I' - base: 'i' - shift, capslock: 'I' - alt: '\u0302' - ctrl, meta: none -} - -key J { - label: 'J' - base: 'j' - shift, capslock: 'J' - ctrl, alt, meta: none -} - -key K { - label: 'K' - base: 'k' - shift, capslock: 'K' - ctrl, alt, meta: none -} - -key L { - label: 'L' - base: 'l' - shift, capslock: 'L' - ctrl, alt, meta: none -} - -key M { - label: 'M' - base: 'm' - shift, capslock: 'M' - ctrl, alt, meta: none -} - -key N { - label: 'N' - base: 'n' - shift, capslock: 'N' - alt: '\u0303' - ctrl, meta: none -} - -key O { - label: 'O' - base: 'o' - shift, capslock: 'O' - ctrl, alt, meta: none -} - -key P { - label: 'P' - base: 'p' - shift, capslock: 'P' - ctrl, alt, meta: none -} - -key Q { - label: 'Q' - base: 'q' - shift, capslock: 'Q' - ctrl, alt, meta: none -} - -key R { - label: 'R' - base: 'r' - shift, capslock: 'R' - ctrl, alt, meta: none -} - -key S { - label: 'S' - base: 's' - shift, capslock: 'S' - alt: '\u00df' - ctrl, meta: none -} - -key T { - label: 'T' - base: 't' - shift, capslock: 'T' - ctrl, alt, meta: none -} - -key U { - label: 'U' - base: 'u' - shift, capslock: 'U' - alt: '\u0308' - ctrl, meta: none -} - -key V { - label: 'V' - base: 'v' - shift, capslock: 'V' - ctrl, alt, meta: none -} - -key W { - label: 'W' - base: 'w' - shift, capslock: 'W' - ctrl, alt, meta: none -} - -key X { - label: 'X' - base: 'x' - shift, capslock: 'X' - ctrl, alt, meta: none -} - -key Y { - label: 'Y' - base: 'y' - shift, capslock: 'Y' - ctrl, alt, meta: none -} - -key Z { - label: 'Z' - base: 'z' - shift, capslock: 'Z' - ctrl, alt, meta: none -} - -key 0 { - label, number: '0' - base: '0' - shift: ')' - ctrl, alt, meta: none -} - -key 1 { - label, number: '1' - base: '1' - shift: '!' - ctrl, alt, meta: none -} - -key 2 { - label, number: '2' - base: '2' - shift: '@' - ctrl, alt, meta: none -} - -key 3 { - label, number: '3' - base: '3' - shift: '#' - ctrl, alt, meta: none -} - -key 4 { - label, number: '4' - base: '4' - shift: '$' - ctrl, alt, meta: none -} - -key 5 { - label, number: '5' - base: '5' - shift: '%' - ctrl, alt, meta: none -} - -key 6 { - label, number: '6' - base: '6' - shift: '^' - ctrl, alt, meta: none - alt+shift: '\u0302' -} - -key 7 { - label, number: '7' - base: '7' - shift: '&' - ctrl, alt, meta: none -} - -key 8 { - label, number: '8' - base: '8' - shift: '*' - ctrl, alt, meta: none -} - -key 9 { - label, number: '9' - base: '9' - shift: '(' - ctrl, alt, meta: none -} - -key SPACE { - label: ' ' - base: ' ' - ctrl, alt: none - meta: fallback SEARCH -} - -key ENTER { - label: '\n' - base: '\n' - ctrl, alt, meta: none -} - -key TAB { - label: '\t' - base: '\t' - ctrl, alt: none - meta: fallback APP_SWITCH -} - -key COMMA { - label, number: ',' - base: ',' - shift: '<' - ctrl, alt, meta: none -} - -key PERIOD { - label, number: '.' - base: '.' - shift: '>' - ctrl, alt, meta: none -} - -key SLASH { - label, number: '/' - base: '/' - shift: '?' - ctrl, alt, meta: none -} - -key GRAVE { - label, number: '`' - base: '`' - shift: '~' - alt: '\u0300' - alt+shift: '\u0303' - ctrl, meta: none -} - -key MINUS { - label, number: '-' - base: '-' - shift: '_' - ctrl, alt, meta: none -} - -key EQUALS { - label, number: '=' - base: '=' - shift: '+' - ctrl, alt, meta: none -} - -key LEFT_BRACKET { - label, number: '[' - base: '[' - shift: '{' - ctrl, alt, meta: none -} - -key RIGHT_BRACKET { - label, number: ']' - base: ']' - shift: '}' - ctrl, alt, meta: none -} - -key BACKSLASH { - label, number: '\\' - base: '\\' - shift: '|' - ctrl, alt, meta: none -} - -key SEMICOLON { - label, number: ';' - base: ';' - shift: ':' - ctrl, alt, meta: none -} - -key APOSTROPHE { - label, number: '\'' - base: '\'' - shift: '"' - ctrl, alt, meta: none -} - -### Numeric keypad ### - -key NUMPAD_0 { - label, number: '0' - base: fallback INSERT - numlock: '0' - ctrl, alt, meta: none -} - -key NUMPAD_1 { - label, number: '1' - base: fallback MOVE_END - numlock: '1' - ctrl, alt, meta: none -} - -key NUMPAD_2 { - label, number: '2' - base: fallback DPAD_DOWN - numlock: '2' - ctrl, alt, meta: none -} - -key NUMPAD_3 { - label, number: '3' - base: fallback PAGE_DOWN - numlock: '3' - ctrl, alt, meta: none -} - -key NUMPAD_4 { - label, number: '4' - base: fallback DPAD_LEFT - numlock: '4' - ctrl, alt, meta: none -} - -key NUMPAD_5 { - label, number: '5' - base: fallback DPAD_CENTER - numlock: '5' - ctrl, alt, meta: none -} - -key NUMPAD_6 { - label, number: '6' - base: fallback DPAD_RIGHT - numlock: '6' - ctrl, alt, meta: none -} - -key NUMPAD_7 { - label, number: '7' - base: fallback MOVE_HOME - numlock: '7' - ctrl, alt, meta: none -} - -key NUMPAD_8 { - label, number: '8' - base: fallback DPAD_UP - numlock: '8' - ctrl, alt, meta: none -} - -key NUMPAD_9 { - label, number: '9' - base: fallback PAGE_UP - numlock: '9' - ctrl, alt, meta: none -} - -key NUMPAD_LEFT_PAREN { - label, number: '(' - base: '(' - ctrl, alt, meta: none -} - -key NUMPAD_RIGHT_PAREN { - label, number: ')' - base: ')' - ctrl, alt, meta: none -} - -key NUMPAD_DIVIDE { - label, number: '/' - base: '/' - ctrl, alt, meta: none -} - -key NUMPAD_MULTIPLY { - label, number: '*' - base: '*' - ctrl, alt, meta: none -} - -key NUMPAD_SUBTRACT { - label, number: '-' - base: '-' - ctrl, alt, meta: none -} - -key NUMPAD_ADD { - label, number: '+' - base: '+' - ctrl, alt, meta: none -} - -key NUMPAD_DOT { - label, number: '.' - base: fallback FORWARD_DEL - numlock: '.' - ctrl, alt, meta: none -} - -key NUMPAD_COMMA { - label, number: ',' - base: ',' - ctrl, alt, meta: none -} - -key NUMPAD_EQUALS { - label, number: '=' - base: '=' - ctrl, alt, meta: none -} - -key NUMPAD_ENTER { - label: '\n' - base: '\n' fallback ENTER - ctrl, alt, meta: none fallback ENTER -} - -### Special keys on phones ### - -key AT { - label, number: '@' - base: '@' -} - -key STAR { - label, number: '*' - base: '*' -} - -key POUND { - label, number: '#' - base: '#' -} - -key PLUS { - label, number: '+' - base: '+' -} - -### Non-printing keys ### - -key ESCAPE { - base: fallback BACK - meta: fallback HOME - alt: fallback MENU -} diff --git a/usr/keychars/qwerty.kcm b/usr/keychars/qwerty.kcm deleted file mode 100644 index f3e15241..00000000 --- a/usr/keychars/qwerty.kcm +++ /dev/null @@ -1,508 +0,0 @@ -# Copyright (C) 2010 The Android Open Source 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. - -# -# Emulator keyboard character map #1. -# -# This file is no longer used as the platform's default keyboard character map. -# Refer to Generic.kcm and Virtual.kcm instead. -# - -type ALPHA - -key A { - label: 'A' - number: '2' - base: 'a' - shift, capslock: 'A' - alt: '#' - shift+alt, capslock+alt: none -} - -key B { - label: 'B' - number: '2' - base: 'b' - shift, capslock: 'B' - alt: '<' - shift+alt, capslock+alt: none -} - -key C { - label: 'C' - number: '2' - base: 'c' - shift, capslock: 'C' - alt: '9' - shift+alt, capslock+alt: '\u00e7' -} - -key D { - label: 'D' - number: '3' - base: 'd' - shift, capslock: 'D' - alt: '5' - shift+alt, capslock+alt: none -} - -key E { - label: 'E' - number: '3' - base: 'e' - shift, capslock: 'E' - alt: '2' - shift+alt, capslock+alt: '\u0301' -} - -key F { - label: 'F' - number: '3' - base: 'f' - shift, capslock: 'F' - alt: '6' - shift+alt, capslock+alt: '\u00a5' -} - -key G { - label: 'G' - number: '4' - base: 'g' - shift, capslock: 'G' - alt: '-' - shift+alt, capslock+alt: '_' -} - -key H { - label: 'H' - number: '4' - base: 'h' - shift, capslock: 'H' - alt: '[' - shift+alt, capslock+alt: '{' -} - -key I { - label: 'I' - number: '4' - base: 'i' - shift, capslock: 'I' - alt: '$' - shift+alt, capslock+alt: '\u0302' -} - -key J { - label: 'J' - number: '5' - base: 'j' - shift, capslock: 'J' - alt: ']' - shift+alt, capslock+alt: '}' -} - -key K { - label: 'K' - number: '5' - base: 'k' - shift, capslock: 'K' - alt: '"' - shift+alt, capslock+alt: '~' -} - -key L { - label: 'L' - number: '5' - base: 'l' - shift, capslock: 'L' - alt: '\'' - shift+alt, capslock+alt: '`' -} - -key M { - label: 'M' - number: '6' - base: 'm' - shift, capslock: 'M' - alt: '!' - shift+alt, capslock+alt: none -} - -key N { - label: 'N' - number: '6' - base: 'n' - shift, capslock: 'N' - alt: '>' - shift+alt, capslock+alt: '\u0303' -} - -key O { - label: 'O' - number: '6' - base: 'o' - shift, capslock: 'O' - alt: '(' - shift+alt, capslock+alt: none -} - -key P { - label: 'P' - number: '7' - base: 'p' - shift, capslock: 'P' - alt: ')' - shift+alt, capslock+alt: none -} - -key Q { - label: 'Q' - number: '7' - base: 'q' - shift, capslock: 'Q' - alt: '*' - shift+alt, capslock+alt: '\u0300' -} - -key R { - label: 'R' - number: '7' - base: 'r' - shift, capslock: 'R' - alt: '3' - shift+alt, capslock+alt: '\u20ac' -} - -key S { - label: 'S' - number: '7' - base: 's' - shift, capslock: 'S' - alt: '4' - shift+alt, capslock+alt: '\u00df' -} - -key T { - label: 'T' - number: '8' - base: 't' - shift, capslock: 'T' - alt: '+' - shift+alt, capslock+alt: '\u00a3' -} - -key U { - label: 'U' - number: '8' - base: 'u' - shift, capslock: 'U' - alt: '&' - shift+alt, capslock+alt: '\u0308' -} - -key V { - label: 'V' - number: '8' - base: 'v' - shift, capslock: 'V' - alt: '=' - shift+alt, capslock+alt: '^' -} - -key W { - label: 'W' - number: '9' - base: 'w' - shift, capslock: 'W' - alt: '1' - shift+alt, capslock+alt: none -} - -key X { - label: 'X' - number: '9' - base: 'x' - shift, capslock: 'X' - alt: '8' - shift+alt, capslock+alt: '\uef00' -} - -key Y { - label: 'Y' - number: '9' - base: 'y' - shift, capslock: 'Y' - alt: '%' - shift+alt, capslock+alt: '\u00a1' -} - -key Z { - label: 'Z' - number: '9' - base: 'z' - shift, capslock: 'Z' - alt: '7' - shift+alt, capslock+alt: none -} - -key COMMA { - label: ',' - number: ',' - base: ',' - shift: ';' - alt: ';' - shift+alt: '|' -} - -key PERIOD { - label: '.' - number: '.' - base: '.' - shift: ':' - alt: ':' - shift+alt: '\u2026' -} - -key AT { - label: '@' - number: '0' - base: '@' - shift: '0' - alt: '0' - shift+alt: '\u2022' -} - -key SLASH { - label: '/' - number: '/' - base: '/' - shift: '?' - alt: '?' - shift+alt: '\\' -} - -key SPACE { - label: ' ' - number: ' ' - base: ' ' - shift: ' ' - alt: '\uef01' - shift+alt: '\uef01' -} - -key ENTER { - label: '\n' - number: '\n' - base: '\n' - shift: '\n' - alt: '\n' - shift+alt: '\n' -} - -key TAB { - label: '\t' - number: '\t' - base: '\t' - shift: '\t' - alt: '\t' - shift+alt: '\t' -} - -key 0 { - label: '0' - number: '0' - base: '0' - shift: ')' - alt: ')' - shift+alt: ')' -} - -key 1 { - label: '1' - number: '1' - base: '1' - shift: '!' - alt: '!' - shift+alt: '!' -} - -key 2 { - label: '2' - number: '2' - base: '2' - shift: '@' - alt: '@' - shift+alt: '@' -} - -key 3 { - label: '3' - number: '3' - base: '3' - shift: '#' - alt: '#' - shift+alt: '#' -} - -key 4 { - label: '4' - number: '4' - base: '4' - shift: '$' - alt: '$' - shift+alt: '$' -} - -key 5 { - label: '5' - number: '5' - base: '5' - shift: '%' - alt: '%' - shift+alt: '%' -} - -key 6 { - label: '6' - number: '6' - base: '6' - shift: '^' - alt: '^' - shift+alt: '^' -} - -key 7 { - label: '7' - number: '7' - base: '7' - shift: '&' - alt: '&' - shift+alt: '&' -} - -key 8 { - label: '8' - number: '8' - base: '8' - shift: '*' - alt: '*' - shift+alt: '*' -} - -key 9 { - label: '9' - number: '9' - base: '9' - shift: '(' - alt: '(' - shift+alt: '(' -} - -key GRAVE { - label: '`' - number: '`' - base: '`' - shift: '~' - alt: '`' - shift+alt: '~' -} - -key MINUS { - label: '-' - number: '-' - base: '-' - shift: '_' - alt: '-' - shift+alt: '_' -} - -key EQUALS { - label: '=' - number: '=' - base: '=' - shift: '+' - alt: '=' - shift+alt: '+' -} - -key LEFT_BRACKET { - label: '[' - number: '[' - base: '[' - shift: '{' - alt: '[' - shift+alt: '{' -} - -key RIGHT_BRACKET { - label: ']' - number: ']' - base: ']' - shift: '}' - alt: ']' - shift+alt: '}' -} - -key BACKSLASH { - label: '\\' - number: '\\' - base: '\\' - shift: '|' - alt: '\\' - shift+alt: '|' -} - -key SEMICOLON { - label: ';' - number: ';' - base: ';' - shift: ':' - alt: ';' - shift+alt: ':' -} - -key APOSTROPHE { - label: '\'' - number: '\'' - base: '\'' - shift: '"' - alt: '\'' - shift+alt: '"' -} - -key STAR { - label: '*' - number: '*' - base: '*' - shift: '*' - alt: '*' - shift+alt: '*' -} - -key POUND { - label: '#' - number: '#' - base: '#' - shift: '#' - alt: '#' - shift+alt: '#' -} - -key PLUS { - label: '+' - number: '+' - base: '+' - shift: '+' - alt: '+' - shift+alt: '+' -} diff --git a/usr/keychars/qwerty2.kcm b/usr/keychars/qwerty2.kcm deleted file mode 100644 index d96914f0..00000000 --- a/usr/keychars/qwerty2.kcm +++ /dev/null @@ -1,505 +0,0 @@ -# Copyright (C) 2010 The Android Open Source 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. - -# -# Emulator keyboard character map #2. -# - -type ALPHA - -key A { - label: 'A' - number: '2' - base: 'a' - shift, capslock: 'A' - alt: 'a' - shift+alt, capslock+alt: 'A' -} - -key B { - label: 'B' - number: '2' - base: 'b' - shift, capslock: 'B' - alt: 'b' - shift+alt, capslock+alt: 'B' -} - -key C { - label: 'C' - number: '2' - base: 'c' - shift, capslock: 'C' - alt: '\u00e7' - shift+alt, capslock+alt: '\u00e7' -} - -key D { - label: 'D' - number: '3' - base: 'd' - shift, capslock: 'D' - alt: '\'' - shift+alt, capslock+alt: '\'' -} - -key E { - label: 'E' - number: '3' - base: 'e' - shift, capslock: 'E' - alt: '"' - shift+alt, capslock+alt: '\u0301' -} - -key F { - label: 'F' - number: '3' - base: 'f' - shift, capslock: 'F' - alt: '[' - shift+alt, capslock+alt: '[' -} - -key G { - label: 'G' - number: '4' - base: 'g' - shift, capslock: 'G' - alt: ']' - shift+alt, capslock+alt: ']' -} - -key H { - label: 'H' - number: '4' - base: 'h' - shift, capslock: 'H' - alt: '<' - shift+alt, capslock+alt: '<' -} - -key I { - label: 'I' - number: '4' - base: 'i' - shift, capslock: 'I' - alt: '-' - shift+alt, capslock+alt: '\u0302' -} - -key J { - label: 'J' - number: '5' - base: 'j' - shift, capslock: 'J' - alt: '>' - shift+alt, capslock+alt: '>' -} - -key K { - label: 'K' - number: '5' - base: 'k' - shift, capslock: 'K' - alt: ';' - shift+alt, capslock+alt: '~' -} - -key L { - label: 'L' - number: '5' - base: 'l' - shift, capslock: 'L' - alt: ':' - shift+alt, capslock+alt: '`' -} - -key M { - label: 'M' - number: '6' - base: 'm' - shift, capslock: 'M' - alt: '%' - shift+alt, capslock+alt: none -} - -key N { - label: 'N' - number: '6' - base: 'n' - shift, capslock: 'N' - alt: none - shift+alt, capslock+alt: '\u0303' -} - -key O { - label: 'O' - number: '6' - base: 'o' - shift, capslock: 'O' - alt: '+' - shift+alt, capslock+alt: '+' -} - -key P { - label: 'P' - number: '7' - base: 'p' - shift, capslock: 'P' - alt: '=' - shift+alt, capslock+alt: '\u00a5' -} - -key Q { - label: 'Q' - number: '7' - base: 'q' - shift, capslock: 'Q' - alt: '|' - shift+alt, capslock+alt: '\u0300' -} - -key R { - label: 'R' - number: '7' - base: 'r' - shift, capslock: 'R' - alt: '`' - shift+alt, capslock+alt: '\u20ac' -} - -key S { - label: 'S' - number: '7' - base: 's' - shift, capslock: 'S' - alt: '\\' - shift+alt, capslock+alt: '\u00df' -} - -key T { - label: 'T' - number: '8' - base: 't' - shift, capslock: 'T' - alt: '{' - shift+alt, capslock+alt: '\u00a3' -} - -key U { - label: 'U' - number: '8' - base: 'u' - shift, capslock: 'U' - alt: '_' - shift+alt, capslock+alt: '\u0308' -} - -key V { - label: 'V' - number: '8' - base: 'v' - shift, capslock: 'V' - alt: 'v' - shift+alt, capslock+alt: 'V' -} - -key W { - label: 'W' - number: '9' - base: 'w' - shift, capslock: 'W' - alt: '~' - shift+alt, capslock+alt: '~' -} - -key X { - label: 'X' - number: '9' - base: 'x' - shift, capslock: 'X' - alt: 'x' - shift+alt, capslock+alt: '\uef00' -} - -key Y { - label: 'Y' - number: '9' - base: 'y' - shift, capslock: 'Y' - alt: '}' - shift+alt, capslock+alt: '\u00a1' -} - -key Z { - label: 'Z' - number: '9' - base: 'z' - shift, capslock: 'Z' - alt: 'z' - shift+alt, capslock+alt: 'Z' -} - -key COMMA { - label: ',' - number: ',' - base: ',' - shift: '<' - alt: ',' - shift+alt: ',' -} - -key PERIOD { - label: '.' - number: '.' - base: '.' - shift: '>' - alt: '.' - shift+alt: '\u2026' -} - -key AT { - label: '@' - number: '@' - base: '@' - shift: '@' - alt: '@' - shift+alt: '\u2022' -} - -key SLASH { - label: '/' - number: '/' - base: '/' - shift: '?' - alt: '?' - shift+alt: '?' -} - -key SPACE { - label: ' ' - number: ' ' - base: ' ' - shift: ' ' - alt: '\uef01' - shift+alt: '\uef01' -} - -key ENTER { - label: '\n' - number: '\n' - base: '\n' - shift: '\n' - alt: '\n' - shift+alt: '\n' -} - -key TAB { - label: '\t' - number: '\t' - base: '\t' - shift: '\t' - alt: '\t' - shift+alt: '\t' -} - -key 0 { - label: '0' - number: '0' - base: '0' - shift: ')' - alt: ')' - shift+alt: ')' -} - -key 1 { - label: '1' - number: '1' - base: '1' - shift: '!' - alt: '!' - shift+alt: '!' -} - -key 2 { - label: '2' - number: '2' - base: '2' - shift: '@' - alt: '@' - shift+alt: '@' -} - -key 3 { - label: '3' - number: '3' - base: '3' - shift: '#' - alt: '#' - shift+alt: '#' -} - -key 4 { - label: '4' - number: '4' - base: '4' - shift: '$' - alt: '$' - shift+alt: '$' -} - -key 5 { - label: '5' - number: '5' - base: '5' - shift: '%' - alt: '%' - shift+alt: '%' -} - -key 6 { - label: '6' - number: '6' - base: '6' - shift: '^' - alt: '^' - shift+alt: '^' -} - -key 7 { - label: '7' - number: '7' - base: '7' - shift: '&' - alt: '&' - shift+alt: '&' -} - -key 8 { - label: '8' - number: '8' - base: '8' - shift: '*' - alt: '*' - shift+alt: '*' -} - -key 9 { - label: '9' - number: '9' - base: '9' - shift: '(' - alt: '(' - shift+alt: '(' -} - -key GRAVE { - label: '`' - number: '`' - base: '`' - shift: '~' - alt: '`' - shift+alt: '~' -} - -key MINUS { - label: '-' - number: '-' - base: '-' - shift: '_' - alt: '-' - shift+alt: '_' -} - -key EQUALS { - label: '=' - number: '=' - base: '=' - shift: '+' - alt: '=' - shift+alt: '+' -} - -key LEFT_BRACKET { - label: '[' - number: '[' - base: '[' - shift: '{' - alt: '[' - shift+alt: '{' -} - -key RIGHT_BRACKET { - label: ']' - number: ']' - base: ']' - shift: '}' - alt: ']' - shift+alt: '}' -} - -key BACKSLASH { - label: '\\' - number: '\\' - base: '\\' - shift: '|' - alt: '\\' - shift+alt: '|' -} - -key SEMICOLON { - label: ';' - number: ';' - base: ';' - shift: ':' - alt: ';' - shift+alt: ':' -} - -key APOSTROPHE { - label: '\'' - number: '\'' - base: '\'' - shift: '"' - alt: '\'' - shift+alt: '"' -} - -key STAR { - label: '*' - number: '*' - base: '*' - shift: '*' - alt: '*' - shift+alt: '*' -} - -key POUND { - label: '#' - number: '#' - base: '#' - shift: '#' - alt: '#' - shift+alt: '#' -} - -key PLUS { - label: '+' - number: '+' - base: '+' - shift: '+' - alt: '+' - shift+alt: '+' -} diff --git a/usr/keylayout/AVRCP.kl b/usr/keylayout/AVRCP.kl deleted file mode 100644 index 736b43c8..00000000 --- a/usr/keylayout/AVRCP.kl +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (C) 2010 The Android Open Source 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. - -# Key layout used for Bluetooth AVRCP support. - -key 200 MEDIA_PLAY WAKE -key 201 MEDIA_PAUSE WAKE -key 166 MEDIA_STOP WAKE -key 163 MEDIA_NEXT WAKE -key 165 MEDIA_PREVIOUS WAKE -key 168 MEDIA_REWIND WAKE -key 208 MEDIA_FAST_FORWARD WAKE diff --git a/usr/keylayout/Generic.kl b/usr/keylayout/Generic.kl deleted file mode 100644 index 10de6ac9..00000000 --- a/usr/keylayout/Generic.kl +++ /dev/null @@ -1,421 +0,0 @@ -# Copyright (C) 2010 The Android Open Source 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. - -# -# Generic key layout file for full alphabetic US English PC style external keyboards. -# -# This file is intentionally very generic and is intended to support a broad rang of keyboards. -# Do not edit the generic key layout to support a specific keyboard; instead, create -# a new key layout file with the required keyboard configuration. -# - -key 1 ESCAPE -key 2 1 -key 3 2 -key 4 3 -key 5 4 -key 6 5 -key 7 6 -key 8 7 -key 9 8 -key 10 9 -key 11 0 -key 12 MINUS -key 13 EQUALS -key 14 DEL -key 15 TAB -key 16 Q -key 17 W -key 18 E -key 19 R -key 20 T -key 21 Y -key 22 U -key 23 I -key 24 O -key 25 P -key 26 LEFT_BRACKET -key 27 RIGHT_BRACKET -key 28 ENTER -key 29 CTRL_LEFT -key 30 A -key 31 S -key 32 D -key 33 F -key 34 G -key 35 H -key 36 J -key 37 K -key 38 L -key 39 SEMICOLON -key 40 APOSTROPHE -key 41 GRAVE -key 42 SHIFT_LEFT -key 43 BACKSLASH -key 44 Z -key 45 X -key 46 C -key 47 V -key 48 B -key 49 N -key 50 M -key 51 COMMA -key 52 PERIOD -key 53 SLASH -key 54 SHIFT_RIGHT -key 55 NUMPAD_MULTIPLY -key 56 ALT_LEFT -key 57 SPACE -key 58 CAPS_LOCK -key 59 F1 -key 60 F2 -key 61 F3 -key 62 F4 -key 63 F5 -key 64 F6 -key 65 F7 -key 66 F8 -key 67 F9 -key 68 F10 -key 69 NUM_LOCK -key 70 SCROLL_LOCK -key 71 NUMPAD_7 -key 72 NUMPAD_8 -key 73 NUMPAD_9 -key 74 NUMPAD_SUBTRACT -key 75 NUMPAD_4 -key 76 NUMPAD_5 -key 77 NUMPAD_6 -key 78 NUMPAD_ADD -key 79 NUMPAD_1 -key 80 NUMPAD_2 -key 81 NUMPAD_3 -key 82 NUMPAD_0 -key 83 NUMPAD_DOT -# key 84 (undefined) -# key 85 "KEY_ZENKAKUHANKAKU" -key 86 BACKSLASH -key 87 F11 -key 88 F12 -# key 89 "KEY_RO" -# key 90 "KEY_KATAKANA" -# key 91 "KEY_HIRAGANA" -# key 92 "KEY_HENKAN" -# key 93 "KEY_KATAKANAHIRAGANA" -# key 94 "KEY_MUHENKAN" -key 95 NUMPAD_COMMA -key 96 NUMPAD_ENTER -key 97 CTRL_RIGHT -key 98 NUMPAD_DIVIDE -key 99 SYSRQ -key 100 ALT_RIGHT -# key 101 "KEY_LINEFEED" -key 102 MOVE_HOME -key 103 DPAD_UP -key 104 PAGE_UP -key 105 DPAD_LEFT -key 106 DPAD_RIGHT -key 107 MOVE_END -key 108 DPAD_DOWN -key 109 PAGE_DOWN -key 110 INSERT -key 111 FORWARD_DEL -# key 112 "KEY_MACRO" -key 113 VOLUME_MUTE -key 114 VOLUME_DOWN -key 115 VOLUME_UP -key 116 POWER WAKE -key 117 NUMPAD_EQUALS -# key 118 "KEY_KPPLUSMINUS" -key 119 BREAK -# key 120 (undefined) -key 121 NUMPAD_COMMA -# key 122 "KEY_HANGEUL" -# key 123 "KEY_HANJA" -# key 124 "KEY_YEN" -key 125 META_LEFT -key 126 META_RIGHT -key 127 MENU WAKE_DROPPED -key 128 MEDIA_STOP -# key 129 "KEY_AGAIN" -# key 130 "KEY_PROPS" -# key 131 "KEY_UNDO" -# key 132 "KEY_FRONT" -# key 133 "KEY_COPY" -# key 134 "KEY_OPEN" -# key 135 "KEY_PASTE" -# key 136 "KEY_FIND" -# key 137 "KEY_CUT" -# key 138 "KEY_HELP" -key 139 MENU WAKE_DROPPED -# key 140 "KEY_CALC" -# key 141 "KEY_SETUP" -key 142 POWER WAKE -key 143 POWER WAKE -# key 144 "KEY_FILE" -# key 145 "KEY_SENDFILE" -# key 146 "KEY_DELETEFILE" -# key 147 "KEY_XFER" -# key 148 "KEY_PROG1" -# key 149 "KEY_PROG2" -key 150 EXPLORER -# key 151 "KEY_MSDOS" -key 152 POWER WAKE -# key 153 "KEY_DIRECTION" -# key 154 "KEY_CYCLEWINDOWS" -key 155 ENVELOPE -key 156 BOOKMARK -# key 157 "KEY_COMPUTER" -key 158 BACK WAKE_DROPPED -key 159 FORWARD -key 160 MEDIA_CLOSE -key 161 MEDIA_EJECT -key 162 MEDIA_EJECT -key 163 MEDIA_NEXT -key 164 MEDIA_PLAY_PAUSE -key 165 MEDIA_PREVIOUS -key 166 MEDIA_STOP -key 167 MEDIA_RECORD -key 168 MEDIA_REWIND -key 169 CALL -# key 170 "KEY_ISO" -# key 171 "KEY_CONFIG" -key 172 HOME -# key 173 "KEY_REFRESH" -# key 174 "KEY_EXIT" -# key 175 "KEY_MOVE" -# key 176 "KEY_EDIT" -key 177 PAGE_UP -key 178 PAGE_DOWN -key 179 NUMPAD_LEFT_PAREN -key 180 NUMPAD_RIGHT_PAREN -# key 181 "KEY_NEW" -# key 182 "KEY_REDO" -# key 183 F13 -# key 184 F14 -# key 185 F15 -# key 186 F16 -# key 187 F17 -# key 188 F18 -# key 189 F19 -# key 190 F20 -# key 191 F21 -# key 192 F22 -# key 193 F23 -# key 194 F24 -# key 195 (undefined) -# key 196 (undefined) -# key 197 (undefined) -# key 198 (undefined) -# key 199 (undefined) -key 200 MEDIA_PLAY -key 201 MEDIA_PAUSE -# key 202 "KEY_PROG3" -# key 203 "KEY_PROG4" -# key 204 (undefined) -# key 205 "KEY_SUSPEND" -# key 206 "KEY_CLOSE" -key 207 MEDIA_PLAY -key 208 MEDIA_FAST_FORWARD -# key 209 "KEY_BASSBOOST" -# key 210 "KEY_PRINT" -# key 211 "KEY_HP" -key 212 CAMERA -# key 213 "KEY_SOUND" -# key 214 "KEY_QUESTION" -key 215 ENVELOPE -# key 216 "KEY_CHAT" -key 217 SEARCH -# key 218 "KEY_CONNECT" -# key 219 "KEY_FINANCE" -# key 220 "KEY_SPORT" -# key 221 "KEY_SHOP" -# key 222 "KEY_ALTERASE" -# key 223 "KEY_CANCEL" -# key 224 "KEY_BRIGHTNESSDOWN" -# key 225 "KEY_BRIGHTNESSUP" -key 226 HEADSETHOOK - -key 256 BUTTON_1 -key 257 BUTTON_2 -key 258 BUTTON_3 -key 259 BUTTON_4 -key 260 BUTTON_5 -key 261 BUTTON_6 -key 262 BUTTON_7 -key 263 BUTTON_8 -key 264 BUTTON_9 -key 265 BUTTON_10 -key 266 BUTTON_11 -key 267 BUTTON_12 -key 268 BUTTON_13 -key 269 BUTTON_14 -key 270 BUTTON_15 -key 271 BUTTON_16 - -key 288 BUTTON_1 -key 289 BUTTON_2 -key 290 BUTTON_3 -key 291 BUTTON_4 -key 292 BUTTON_5 -key 293 BUTTON_6 -key 294 BUTTON_7 -key 295 BUTTON_8 -key 296 BUTTON_9 -key 297 BUTTON_10 -key 298 BUTTON_11 -key 299 BUTTON_12 -key 300 BUTTON_13 -key 301 BUTTON_14 -key 302 BUTTON_15 -key 303 BUTTON_16 - - -key 304 BUTTON_A -key 305 BUTTON_B -key 306 BUTTON_C -key 307 BUTTON_X -key 308 BUTTON_Y -key 309 BUTTON_Z -key 310 BUTTON_L1 -key 311 BUTTON_R1 -key 312 BUTTON_L2 -key 313 BUTTON_R2 -key 314 BUTTON_SELECT -key 315 BUTTON_START -key 316 BUTTON_MODE -key 317 BUTTON_THUMBL -key 318 BUTTON_THUMBR - - -# key 352 "KEY_OK" -# key 353 "KEY_SELECT" -# key 354 "KEY_GOTO" -# key 355 "KEY_CLEAR" -# key 356 "KEY_POWER2" -# key 357 "KEY_OPTION" -# key 358 "KEY_INFO" -# key 359 "KEY_TIME" -# key 360 "KEY_VENDOR" -# key 361 "KEY_ARCHIVE" -key 362 GUIDE -# key 363 "KEY_CHANNEL" -# key 364 "KEY_FAVORITES" -# key 365 "KEY_EPG" -key 366 DVR -# key 367 "KEY_MHP" -# key 368 "KEY_LANGUAGE" -# key 369 "KEY_TITLE" -# key 370 "KEY_SUBTITLE" -# key 371 "KEY_ANGLE" -# key 372 "KEY_ZOOM" -# key 373 "KEY_MODE" -# key 374 "KEY_KEYBOARD" -# key 375 "KEY_SCREEN" -# key 376 "KEY_PC" -key 377 TV -# key 378 "KEY_TV2" -# key 379 "KEY_VCR" -# key 380 "KEY_VCR2" -# key 381 "KEY_SAT" -# key 382 "KEY_SAT2" -# key 383 "KEY_CD" -# key 384 "KEY_TAPE" -# key 385 "KEY_RADIO" -# key 386 "KEY_TUNER" -# key 387 "KEY_PLAYER" -# key 388 "KEY_TEXT" -# key 389 "KEY_DVD" -# key 390 "KEY_AUX" -# key 391 "KEY_MP3" -# key 392 "KEY_AUDIO" -# key 393 "KEY_VIDEO" -# key 394 "KEY_DIRECTORY" -# key 395 "KEY_LIST" -# key 396 "KEY_MEMO" -# key 397 "KEY_CALENDAR" -# key 398 "KEY_RED" -# key 399 "KEY_GREEN" -# key 400 "KEY_YELLOW" -# key 401 "KEY_BLUE" -key 402 CHANNEL_UP -key 403 CHANNEL_DOWN -# key 404 "KEY_FIRST" -# key 405 "KEY_LAST" -# key 406 "KEY_AB" -# key 407 "KEY_NEXT" -# key 408 "KEY_RESTART" -# key 409 "KEY_SLOW" -# key 410 "KEY_SHUFFLE" -# key 411 "KEY_BREAK" -# key 412 "KEY_PREVIOUS" -# key 413 "KEY_DIGITS" -# key 414 "KEY_TEEN" -# key 415 "KEY_TWEN" - - -# key 448 "KEY_DEL_EOL" -# key 449 "KEY_DEL_EOS" -# key 450 "KEY_INS_LINE" -# key 451 "KEY_DEL_LINE" - - -key 464 FUNCTION -key 465 ESCAPE FUNCTION -key 466 F1 FUNCTION -key 467 F2 FUNCTION -key 468 F3 FUNCTION -key 469 F4 FUNCTION -key 470 F5 FUNCTION -key 471 F6 FUNCTION -key 472 F7 FUNCTION -key 473 F8 FUNCTION -key 474 F9 FUNCTION -key 475 F10 FUNCTION -key 476 F11 FUNCTION -key 477 F12 FUNCTION -key 478 1 FUNCTION -key 479 2 FUNCTION -key 480 D FUNCTION -key 481 E FUNCTION -key 482 F FUNCTION -key 483 S FUNCTION -key 484 B FUNCTION - - -# key 497 KEY_BRL_DOT1 -# key 498 KEY_BRL_DOT2 -# key 499 KEY_BRL_DOT3 -# key 500 KEY_BRL_DOT4 -# key 501 KEY_BRL_DOT5 -# key 502 KEY_BRL_DOT6 -# key 503 KEY_BRL_DOT7 -# key 504 KEY_BRL_DOT8 - - -# Joystick and game controller axes. -# Axes that are not mapped will be assigned generic axis numbers by the input subsystem. -axis 0x00 X -axis 0x01 Y -axis 0x02 Z -axis 0x03 RX -axis 0x04 RY -axis 0x05 RZ -axis 0x06 THROTTLE -axis 0x07 RUDDER -axis 0x08 WHEEL -axis 0x09 GAS -axis 0x0a BRAKE -axis 0x10 HAT_X -axis 0x11 HAT_Y diff --git a/usr/keylayout/Vendor_045e_Product_028e.kl b/usr/keylayout/Vendor_045e_Product_028e.kl deleted file mode 100644 index 99f046af..00000000 --- a/usr/keylayout/Vendor_045e_Product_028e.kl +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (C) 2011 The Android Open Source 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. - -# -# XBox 360 USB Controller -# - -key 304 BUTTON_A -key 305 BUTTON_B -key 307 BUTTON_X -key 308 BUTTON_Y -key 310 BUTTON_L1 -key 311 BUTTON_R1 -key 314 BUTTON_SELECT -key 315 BUTTON_START -key 316 BUTTON_MODE -key 317 BUTTON_THUMBL -key 318 BUTTON_THUMBR - -# Left and right stick. -# The reported value for flat is 128 out of a range from -32767 to 32768, which is absurd. -# This confuses applications that rely on the flat value because the joystick actually -# settles in a flat range of +/- 4096 or so. -axis 0x00 X flat 4096 -axis 0x01 Y flat 4096 -axis 0x03 Z flat 4096 -axis 0x04 RZ flat 4096 - -# Triggers. -axis 0x02 LTRIGGER -axis 0x05 RTRIGGER - -# Hat. -axis 0x10 HAT_X -axis 0x11 HAT_Y diff --git a/usr/keylayout/Vendor_046d_Product_c216.kl b/usr/keylayout/Vendor_046d_Product_c216.kl deleted file mode 100644 index 6743323d..00000000 --- a/usr/keylayout/Vendor_046d_Product_c216.kl +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2011 The Android Open Source 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. - -# -# Logitech Dual Action Controller -# - -key 0x120 BUTTON_A -key 0x123 BUTTON_B -key 0x121 BUTTON_X -key 0x122 BUTTON_Y -key 0x124 BUTTON_L1 -key 0x125 BUTTON_R1 -key 0x126 BUTTON_L2 -key 0x127 BUTTON_R2 -key 0x128 BUTTON_SELECT -key 0x129 BUTTON_START -key 0x12a BUTTON_THUMBL -key 0x12b BUTTON_THUMBR - -axis 0x00 X -axis 0x01 Y -axis 0x02 Z -axis 0x05 RZ -axis 0x10 HAT_X -axis 0x11 HAT_Y diff --git a/usr/keylayout/Vendor_046d_Product_c294.kl b/usr/keylayout/Vendor_046d_Product_c294.kl deleted file mode 100644 index 5492f497..00000000 --- a/usr/keylayout/Vendor_046d_Product_c294.kl +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright (C) 2011 The Android Open Source 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. - -# -# Logitech G25 Racing Wheel (in Compatibility Mode) -# - -# 4 way buttons above hat -key 0x121 BUTTON_A -key 0x123 BUTTON_B -key 0x120 BUTTON_X -key 0x122 BUTTON_Y - -# Row of buttons under hat -key 0x12b BUTTON_1 -key 0x128 BUTTON_2 -key 0x129 BUTTON_3 -key 0x12a BUTTON_4 - -# Gear shift positions -# 0x12a top-left gear (aliased as BUTTON_4) -# 0x12b bottom-left gear (aliased as BUTTON_1) - -# Buttons on wheel -key 0x127 BUTTON_L1 -key 0x126 BUTTON_R1 - -# Toggles under wheel -key 0x125 BUTTON_L2 -key 0x124 BUTTON_R2 - -# Hat -axis 0x10 HAT_X -axis 0x11 HAT_Y - -# Steering Wheel -axis 0x00 WHEEL - -# Accelerator / Brake -# 00..7e : accelerator -# 80..ff : brake -axis 0x01 split 0x7f GAS BRAKE diff --git a/usr/keylayout/Vendor_046d_Product_c299.kl b/usr/keylayout/Vendor_046d_Product_c299.kl deleted file mode 100644 index d42963db..00000000 --- a/usr/keylayout/Vendor_046d_Product_c299.kl +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright (C) 2011 The Android Open Source 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. - -# -# Logitech G25 Racing Wheel (in Native Mode) -# - -# 4 way buttons above hat -key 0x121 BUTTON_A -key 0x123 BUTTON_B -key 0x120 BUTTON_X -key 0x122 BUTTON_Y - -# Row of buttons under hat -key 0x12b BUTTON_1 -key 0x128 BUTTON_2 -key 0x129 BUTTON_3 -key 0x12a BUTTON_4 - -# Gear shift positions -key 0x12c BUTTON_5 -key 0x12d BUTTON_6 -key 0x12e BUTTON_7 -key 0x12f BUTTON_8 -key 0x2d0 BUTTON_9 -key 0x2d1 BUTTON_10 -key 0x2d2 BUTTON_11 - -# Buttons on wheel -key 0x127 BUTTON_L1 -key 0x126 BUTTON_R1 - -# Toggles under wheel -key 0x125 BUTTON_L2 -key 0x124 BUTTON_R2 - -# Hat -axis 0x10 HAT_X -axis 0x11 HAT_Y - -# Steering Wheel -axis 0x00 WHEEL - -# Clutch -axis 0x01 invert GENERIC_1 - -# Accelerator -axis 0x02 invert GAS - -# Brake -axis 0x05 invert BRAKE diff --git a/usr/keylayout/Vendor_046d_Product_c532.kl b/usr/keylayout/Vendor_046d_Product_c532.kl deleted file mode 100644 index 741c2e18..00000000 --- a/usr/keylayout/Vendor_046d_Product_c532.kl +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright (C) 2010 The Android Open Source 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. - -# -# Logitech Revue Wireless keyboard -# -# Notes: -# - The GRAVE key is emulated by the keyboard. -# ALT + LEFT_BRACKET produces GRAVE. -# ALT + RIGHT_BRACKET produces SHIFT + GRAVE. -# - FORWARD_DEL is produced by fn + BACKSPACE -# - PAGE_UP / PAGE_DOWN is produced by fn + CHANNEL_UP / CHANNEL_DOWN -# - The AVR / STB / TV power and input buttons seem to be non-functional -# as well as several of the other fn buttons and the PIP button? - -key 1 ESCAPE -key 2 1 -key 3 2 -key 4 3 -key 5 4 -key 6 5 -key 7 6 -key 8 7 -key 9 8 -key 10 9 -key 11 0 -key 12 MINUS -key 13 EQUALS -key 14 DEL -key 15 TAB -key 16 Q -key 17 W -key 18 E -key 19 R -key 20 T -key 21 Y -key 22 U -key 23 I -key 24 O -key 25 P -key 26 LEFT_BRACKET -key 27 RIGHT_BRACKET -key 28 ENTER -key 29 CTRL_LEFT -key 30 A -key 31 S -key 32 D -key 33 F -key 34 G -key 35 H -key 36 J -key 37 K -key 38 L -key 39 SEMICOLON -key 40 APOSTROPHE -key 41 GRAVE -key 42 SHIFT_LEFT -key 43 BACKSLASH -key 44 Z -key 45 X -key 46 C -key 47 V -key 48 B -key 49 N -key 50 M -key 51 COMMA -key 52 PERIOD -key 53 SLASH -key 54 SHIFT_RIGHT -key 56 ALT_RIGHT -key 57 SPACE -key 58 CAPS_LOCK -key 59 F1 -key 60 F2 -key 61 F3 -key 62 F4 -key 63 F5 -key 64 F6 -key 65 F7 -key 66 F8 -key 67 F9 -key 68 F10 -key 87 F11 -key 88 F12 -key 96 DPAD_CENTER -key 97 CTRL_RIGHT -key 102 MOVE_HOME -key 103 DPAD_UP -key 104 PAGE_UP -key 105 DPAD_LEFT -key 106 DPAD_RIGHT -key 107 MOVE_END -key 108 DPAD_DOWN -key 109 PAGE_DOWN -key 110 NUMPAD_ENTER -key 111 FORWARD_DEL -key 113 VOLUME_MUTE -key 114 VOLUME_DOWN -key 115 VOLUME_UP -key 119 MEDIA_PAUSE -key 125 SEARCH -key 127 MENU -key 156 BOOKMARK -key 158 BACK -key 163 MEDIA_NEXT -key 165 MEDIA_PREVIOUS -key 166 MEDIA_STOP -key 167 MEDIA_RECORD -key 168 MEDIA_REWIND -key 172 HOME -key 207 MEDIA_PLAY -key 208 MEDIA_FAST_FORWARD -# key 288 left mouse button -# key 289 right mouse button (fn + button) -key 362 GUIDE -key 366 DVR -key 377 TV -key 402 CHANNEL_UP -key 403 CHANNEL_DOWN -key 418 ZOOM_IN -key 419 ZOOM_OUT - diff --git a/usr/keylayout/Vendor_054c_Product_0268.kl b/usr/keylayout/Vendor_054c_Product_0268.kl deleted file mode 100644 index f8ac6a35..00000000 --- a/usr/keylayout/Vendor_054c_Product_0268.kl +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright (C) 2011 The Android Open Source 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. - -# -# Sony Playstation(R)3 Controller -# - -key 0x124 DPAD_UP -key 0x125 DPAD_RIGHT -key 0x126 DPAD_DOWN -key 0x127 DPAD_LEFT - -key 0x120 BUTTON_SELECT -key 0x123 BUTTON_START -key 0x12f BUTTON_A -key 0x12c BUTTON_B -key 0x12e BUTTON_X -key 0x12d BUTTON_Y -key 0x12a BUTTON_L1 -key 0x12b BUTTON_R1 -key 0x128 BUTTON_L2 -key 0x129 BUTTON_R2 -key 0x121 BUTTON_THUMBL -key 0x122 BUTTON_THUMBR - -# PS key -key 0x2d0 BUTTON_1 - -# Left Analog Stick -axis 0x00 X -axis 0x01 Y - -# Right Analog Stick -axis 0x02 Z -axis 0x05 RZ - -# DPAD -# axis 0x2c -HAT_Y -# axis 0x2d +HAT_X -# axis 0x2e +HAT_Y -# axis 0x2f -HAT_X - -# L2 trigger -axis 0x30 LTRIGGER - -# R2 trigger -axis 0x31 RTRIGGER - -# L1 trigger -# axis 0x32 - -# R1 trigger -# axis 0x33 - -# Triangle -# axis 0x34 - -# Circle -# axis 0x35 - -# Cross -# axis 0x36 - -# Square -# axis 0x37 diff --git a/usr/keylayout/Vendor_05ac_Product_0239.kl b/usr/keylayout/Vendor_05ac_Product_0239.kl deleted file mode 100644 index 6bd37537..00000000 --- a/usr/keylayout/Vendor_05ac_Product_0239.kl +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright (C) 2010 The Android Open Source 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. - -# -# Apple Wireless Keyboard -# -# Notes: -# - Keys such as PAGE_UP and FORWARD_DEL are produced using the -# function key. -# - Special function keys for brightness control, etc. are not -# implemented here. - -key 1 ESCAPE -key 2 1 -key 3 2 -key 4 3 -key 5 4 -key 6 5 -key 7 6 -key 8 7 -key 9 8 -key 10 9 -key 11 0 -key 12 MINUS -key 13 EQUALS -key 14 DEL -key 15 TAB -key 16 Q -key 17 W -key 18 E -key 19 R -key 20 T -key 21 Y -key 22 U -key 23 I -key 24 O -key 25 P -key 26 LEFT_BRACKET -key 27 RIGHT_BRACKET -key 28 ENTER -key 29 CTRL_LEFT -key 30 A -key 31 S -key 32 D -key 33 F -key 34 G -key 35 H -key 36 J -key 37 K -key 38 L -key 39 SEMICOLON -key 40 APOSTROPHE -key 41 GRAVE -key 42 SHIFT_LEFT -key 43 BACKSLASH -key 44 Z -key 45 X -key 46 C -key 47 V -key 48 B -key 49 N -key 50 M -key 51 COMMA -key 52 PERIOD -key 53 SLASH -key 54 SHIFT_RIGHT -key 56 ALT_LEFT -key 57 SPACE -key 58 CAPS_LOCK -key 59 F1 -key 60 F2 -key 61 F3 -key 62 F4 -key 63 F5 -key 64 F6 -key 65 F7 -key 66 F8 -key 67 F9 -key 68 F10 -key 87 F11 -key 88 F12 -key 100 ALT_RIGHT -key 102 MOVE_HOME -key 103 DPAD_UP -key 104 PAGE_UP -key 105 DPAD_LEFT -key 106 DPAD_RIGHT -key 107 MOVE_END -key 108 DPAD_DOWN -key 109 PAGE_DOWN -key 110 NUMPAD_ENTER -key 111 FORWARD_DEL -key 113 VOLUME_MUTE -key 114 VOLUME_DOWN -key 115 VOLUME_UP -key 120 APP_SWITCH -key 125 META_LEFT -key 126 META_RIGHT -key 161 MEDIA_EJECT -key 163 MEDIA_NEXT -key 164 MEDIA_PLAY_PAUSE -key 165 MEDIA_PREVIOUS -# key 204 show gadgets -# key 224 reduce brightness -# key 225 increase brightness -# key 229 blank special function on F5 -# key 230 blank special function on F6 -key 464 FUNCTION diff --git a/usr/keylayout/Vendor_22b8_Product_093d.kl b/usr/keylayout/Vendor_22b8_Product_093d.kl deleted file mode 100644 index 2749c5ba..00000000 --- a/usr/keylayout/Vendor_22b8_Product_093d.kl +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright (C) 2010 The Android Open Source 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. - -# -# Motorola Bluetooth Wireless Keyboard. -# - -key 1 BACK -key 2 1 -key 3 2 -key 4 3 -key 5 4 -key 6 5 -key 7 6 -key 8 7 -key 9 8 -key 10 9 -key 11 0 -key 12 MINUS -key 13 EQUALS -key 14 DEL -key 15 TAB -key 16 Q -key 17 W -key 18 E -key 19 R -key 20 T -key 21 Y -key 22 U -key 23 I -key 24 O -key 25 P -key 26 LEFT_BRACKET -key 27 RIGHT_BRACKET -key 28 ENTER -key 29 CTRL_LEFT -key 30 A -key 31 S -key 32 D -key 33 F -key 34 G -key 35 H -key 36 J -key 37 K -key 38 L -key 39 SEMICOLON -key 40 APOSTROPHE -key 41 GRAVE -key 42 SHIFT_LEFT -key 43 BACKSLASH -key 44 Z -key 45 X -key 46 C -key 47 V -key 48 B -key 49 N -key 50 M -key 51 COMMA -key 52 PERIOD -key 53 SLASH -key 54 SHIFT_RIGHT -key 56 ALT_LEFT -key 57 SPACE -key 58 CAPS_LOCK -key 59 F1 -key 60 F2 -key 61 F3 -key 62 F4 -key 63 F5 -key 64 F6 -key 65 F7 -key 66 F8 -key 67 F9 -key 68 F10 -key 87 F11 -key 88 F12 -key 97 CTRL_RIGHT -key 102 HOME -key 103 DPAD_UP -key 105 DPAD_LEFT -key 106 DPAD_RIGHT -key 107 MOVE_END -key 108 DPAD_DOWN -key 111 FORWARD_DEL -key 113 VOLUME_MUTE -key 114 VOLUME_DOWN -key 115 VOLUME_UP -key 125 MENU -key 127 SEARCH -key 163 MEDIA_NEXT -key 164 MEDIA_PLAY_PAUSE -key 165 MEDIA_PREVIOUS -key 166 MEDIA_STOP -# key 226 tbd reserved key diff --git a/usr/keylayout/gpio-keys.kl b/usr/keylayout/gpio-keys.kl index b7abd0b4..e7413fe3 100644 --- a/usr/keylayout/gpio-keys.kl +++ b/usr/keylayout/gpio-keys.kl @@ -1,11 +1,4 @@ -key 115 VOLUME_UP WAKE -key 114 VOLUME_DOWN WAKE -key 102 HOME WAKE -key 107 ENDCALL -key 105 DPAD_LEFT -key 106 DPAD_RIGHT -key 103 DPAD_UP -key 108 DPAD_DOWN -key 232 DPAD_CENTER +key 115 VOLUME_UP WAKE +key 114 VOLUME_DOWN WAKE key 116 POWER WAKE -key 212 CAMERA WAKE +key 102 HOME WAKE diff --git a/usr/keylayout/qwerty.kl b/usr/keylayout/qwerty.kl deleted file mode 100644 index f1caacd4..00000000 --- a/usr/keylayout/qwerty.kl +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright (C) 2010 The Android Open Source 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. - -# -# Emulator keyboard layout #1. -# -# This file is no longer used as the platform's default keyboard layout. -# Refer to Generic.kl instead. -# - -key 399 GRAVE -key 2 1 -key 3 2 -key 4 3 -key 5 4 -key 6 5 -key 7 6 -key 8 7 -key 9 8 -key 10 9 -key 11 0 -key 158 BACK WAKE_DROPPED -key 230 SOFT_RIGHT WAKE -key 60 SOFT_RIGHT WAKE -key 107 ENDCALL WAKE_DROPPED -key 62 ENDCALL WAKE_DROPPED -key 229 MENU WAKE_DROPPED -key 139 MENU WAKE_DROPPED -key 59 MENU WAKE_DROPPED -key 127 SEARCH WAKE_DROPPED -key 217 SEARCH WAKE_DROPPED -key 228 POUND -key 227 STAR -key 231 CALL WAKE_DROPPED -key 61 CALL WAKE_DROPPED -key 232 DPAD_CENTER WAKE_DROPPED -key 108 DPAD_DOWN WAKE_DROPPED -key 103 DPAD_UP WAKE_DROPPED -key 102 HOME WAKE -key 105 DPAD_LEFT WAKE_DROPPED -key 106 DPAD_RIGHT WAKE_DROPPED -key 115 VOLUME_UP WAKE -key 114 VOLUME_DOWN WAKE -key 116 POWER WAKE -key 212 CAMERA - -key 16 Q -key 17 W -key 18 E -key 19 R -key 20 T -key 21 Y -key 22 U -key 23 I -key 24 O -key 25 P -key 26 LEFT_BRACKET -key 27 RIGHT_BRACKET -key 43 BACKSLASH - -key 30 A -key 31 S -key 32 D -key 33 F -key 34 G -key 35 H -key 36 J -key 37 K -key 38 L -key 39 SEMICOLON -key 40 APOSTROPHE -key 14 DEL - -key 44 Z -key 45 X -key 46 C -key 47 V -key 48 B -key 49 N -key 50 M -key 51 COMMA -key 52 PERIOD -key 53 SLASH -key 28 ENTER - -key 56 ALT_LEFT -key 100 ALT_RIGHT -key 42 SHIFT_LEFT -key 54 SHIFT_RIGHT -key 15 TAB -key 57 SPACE -key 150 EXPLORER -key 155 ENVELOPE - -key 12 MINUS -key 13 EQUALS -key 215 AT - -# On an AT keyboard: ESC, F10 -key 1 BACK WAKE_DROPPED -key 68 MENU WAKE_DROPPED diff --git a/usr/keylayout/sii9234_rcp.kl b/usr/keylayout/sii9234_rcp.kl new file mode 100644 index 00000000..ae6c6a2e --- /dev/null +++ b/usr/keylayout/sii9234_rcp.kl @@ -0,0 +1,28 @@ +key 1 ENTER WAKE_DROPPED +key 2 DPAD_UP WAKE_DROPPED +key 3 DPAD_DOWN WAKE_DROPPED +key 4 DPAD_LEFT WAKE_DROPPED +key 5 DPAD_RIGHT WAKE_DROPPED +key 10 MENU WAKE_DROPPED +key 14 BACK WAKE_DROPPED + +key 33 0 +key 34 1 +key 35 2 +key 36 3 +key 37 4 +key 38 5 +key 39 6 +key 40 7 +key 41 8 +key 42 9 + +key 45 DEL + +key 69 MEDIA_PLAY_PAUSE WAKE +key 70 MEDIA_STOP WAKE +key 71 MEDIA_PLAY_PAUSE WAKE +key 73 MEDIA_REWIND WAKE +key 74 MEDIA_FAST_FORWARD WAKE +key 76 MEDIA_NEXT WAKE +key 77 MEDIA_PREVIOUS WAKE From 98cb0cfdb4681181c15ad560726cbb4fce73df2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Espen=20Fjellv=C3=A6r=20Olsen?= Date: Fri, 22 Feb 2013 22:15:19 +0100 Subject: [PATCH 26/52] Kill vendor-cam Change-Id: Iec202189241f621dbb739a5864ab151e2ac965a7 --- extract-files.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/extract-files.sh b/extract-files.sh index 68d597f2..651a13bc 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -31,7 +31,6 @@ for FILE in `cat proprietary-files.txt | grep -v ^# | grep -v ^$`; do fi adb pull /$FILE $DEVICEBASE/$FILE done -adb pull /system/lib/hw/vendor-camera.exynos4.so $DEVICEBASE/system/lib/hw/camera.exynos4.so (cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__VENDOR__/$VENDOR/g > $DEVICEMAKEFILE From 9a2d18ef327e1fc83cdc6a411992a69607e640e1 Mon Sep 17 00:00:00 2001 From: Andrew Jiang Date: Sat, 23 Feb 2013 14:23:00 -0500 Subject: [PATCH 27/52] I9100: Fix extract-script Durp. Change-Id: I35cec062c7f60a09109e48bd345dab76326c646c --- extract-files.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/extract-files.sh b/extract-files.sh index 651a13bc..828bd55e 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -53,9 +53,6 @@ PRODUCT_COPY_FILES := \\ vendor/__VENDOR__/__DEVICE__/proprietary/system/lib/libril.so:obj/lib/libril.so \\ vendor/__VENDOR__/__DEVICE__/proprietary/system/lib/libsecril-client.so:obj/lib/libsecril-client.so -PRODUCT_COPY_FILES += \\ - vendor/__VENDOR__/__DEVICE__/proprietary/system/lib/hw/camera.exynos4.so:system/lib/hw/vendor-camera.exynos4.so - PRODUCT_COPY_FILES += \\ EOF From ffc8ef688276b14a479aef9e363d3a572e938d69 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Thu, 7 Mar 2013 16:26:49 +0000 Subject: [PATCH 28/52] i9100: add ext4 as second filesystem for sdcard for recovery Change-Id: I4fca803ff3d502546f9879e019af0dac0aa1c066 --- recovery.fstab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recovery.fstab b/recovery.fstab index 457ea15d..a210f6a9 100644 --- a/recovery.fstab +++ b/recovery.fstab @@ -10,4 +10,4 @@ /preload ext4 /dev/block/mmcblk0p12 /emmc vfat /dev/block/mmcblk0p11 -/sdcard vfat /dev/block/mmcblk1p1 +/sdcard vfat /dev/block/mmcblk1p1 fstype2=ext4 From b69e9602fc389ba031f93bd1b1cf0266bb1cf6d3 Mon Sep 17 00:00:00 2001 From: Mikael Lindemann Jepsen Date: Sat, 9 Mar 2013 10:57:52 +0100 Subject: [PATCH 29/52] GalaxyS2Settings: Added Danish translation Patch Set 2: Fix whitespace in strings.xml Patch Set 3: Include Jacob's suggestions Patch Set 4: Default isn't a Danish word... Change-Id: I45319b0c3e8b49c1290f06cd84049e044cb630eb --- DeviceSettings/res/values-da/arrays.xml | 68 ++++++++++++++++++++++++ DeviceSettings/res/values-da/strings.xml | 50 +++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 DeviceSettings/res/values-da/arrays.xml create mode 100644 DeviceSettings/res/values-da/strings.xml diff --git a/DeviceSettings/res/values-da/arrays.xml b/DeviceSettings/res/values-da/arrays.xml new file mode 100644 index 00000000..d3aa9d26 --- /dev/null +++ b/DeviceSettings/res/values-da/arrays.xml @@ -0,0 +1,68 @@ + + + + Kamera (Standard) + Video + Varm Video + Kold Video + UI + Navigation + Galleri + VT + + + + Standard + Dynamisk + Naturlig + Film + + + + Normal + Negativ + + + + Fra (Standard) + Til + + + + 2.2 (Standard) + 1.9 + + + + 10 + 20 + 30 + 50 (Standard) + 70 + 100 + + + + 0% + 25% + 50% (Standard) + 75% + 100% + + + + Kun UMTS + Kun HSDPA + HSDPA + HSUPA + + + + Aldrig + 1 sekund + 2 sekunder + 3 sekunder (Standard) + 4 sekunder + 5 sekunder + 6 sekunder + + diff --git a/DeviceSettings/res/values-da/strings.xml b/DeviceSettings/res/values-da/strings.xml new file mode 100644 index 00000000..eb1c6789 --- /dev/null +++ b/DeviceSettings/res/values-da/strings.xml @@ -0,0 +1,50 @@ + + + Galaxy S II Indstillinger + + Skærm + Farver + Scenarie + Vælg mDNIe-scenarie + Tilstand + Vælg mDNIe-tilstand + Negativ tilstand + Slå negative farver til/fra + Udendørs tilstand + Slå udendørs tilstand til/fra + Gamma + Indstil gamma + + Touchscreen + Følsomhed + Indstil skærmens følsomhed + + Berøringstaster + Brug baggrundslys + Lys tasterne op når skærmen er tændt + Timeout + Tid før lyset slukker + + Sensorer + Accelerometer + Brug data fra kalibrering + Brug værdier fra kalibrering. Udfør kalibrering efter du vælger denne! + Kalibrér + Læg din telefon på en vandret overflade og tryk her for kalibrering + Kalibrering fuldført + Accelerometeret er kalibreret. + + Haptik + Vibrator + Vibrator-styrke + Indstil vibratorens intensitet + + Radio + HSPA + Slå HSDPA/HSUPA til/fra + + Dock + Lyd + Brug Dockens USB lyd + Spil lyden gennem dockens højttaler + From 48b2c5cda76b50fdc2a72006907bbdcdf7a660c1 Mon Sep 17 00:00:00 2001 From: athurh Date: Sat, 9 Mar 2013 02:25:02 +0100 Subject: [PATCH 30/52] i9100: Remove keyguard security height overlay before: http://img255.imageshack.us/img255/2807/screenshot2013031120065.png after: http://img547.imageshack.us/img547/6741/screenshot2013031323274.png Change-Id: Id037b80254fb8f3c9ad359f9f19b971c65870b48 --- .../base/core/res/res/values/dimens.xml | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 overlay/frameworks/base/core/res/res/values/dimens.xml diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/overlay/frameworks/base/core/res/res/values/dimens.xml deleted file mode 100644 index f6d787e6..00000000 --- a/overlay/frameworks/base/core/res/res/values/dimens.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - 348dp - - From 39ce71830652d3fe6a09c3c233c3dc755189a79a Mon Sep 17 00:00:00 2001 From: Mateusz Malek Date: Thu, 28 Mar 2013 23:23:02 +0000 Subject: [PATCH 31/52] i9100: polish translations for device settings PS4: deleted untransatable strings PS6: minor changes PS8: new patch set (Cid fails to compile the previous one) Change-Id: I05b5f739d2f115883e81ad795e7bdadd64f999d8 --- DeviceSettings/res/values-pl/arrays.xml | 69 ++++++++++++++++++++++++ DeviceSettings/res/values-pl/strings.xml | 50 +++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 DeviceSettings/res/values-pl/arrays.xml create mode 100644 DeviceSettings/res/values-pl/strings.xml diff --git a/DeviceSettings/res/values-pl/arrays.xml b/DeviceSettings/res/values-pl/arrays.xml new file mode 100644 index 00000000..45286a5b --- /dev/null +++ b/DeviceSettings/res/values-pl/arrays.xml @@ -0,0 +1,69 @@ + + + + Kamera (domyślnie) + Wideo + Ciepły film + Zimny film + UI + Nawigacja + Galeria + VT + + + + Dynamicznie (domyślnie) + Standardowo + Naturalnie + Film + + + + Normalnie + Odwrócony + + + + Wyłączony (domyślnie) + Włączony + + + + 2.2 (domyślnie) + 1.9 + + + + 10 + 20 + 30 + 50 (domyślnie) + 70 + 100 + + + + 0% + 25% + 50% (domyślnie) + 75% + 100% + + + + Tylko UMTS + Tylko HSDPA + HSDPA + HSUPA + + + + Nigdy + 1 sekunda + 2 sekundy + 3 sekundy (domyślnie) + 4 sekundy + 5 sekund + 6 sekund + + + diff --git a/DeviceSettings/res/values-pl/strings.xml b/DeviceSettings/res/values-pl/strings.xml new file mode 100644 index 00000000..054ac080 --- /dev/null +++ b/DeviceSettings/res/values-pl/strings.xml @@ -0,0 +1,50 @@ + + + Ustawienia Galaxy S II + + Ekran + Kolory + Technologia mDNIe + Ustaw scenariusz mDNIe + Tryb + Ustaw tryb mDNIe + Tryb negatywu + Włącz/wyłącz odwrócone kolory + Tryb plenerowy + Aktywuj/deaktywuj tryb plenerowy + Poziom gamma ekranu + Ustaw poziom gamma ekranu + + Ekran dotykowy + Czułość ekranu dotykowego + Ustaw czułość ekranu dotykowego + + Przyciski dotykowe + Włącz podświetlenie przycisków + Podświetl przyciski kiedy ekran jest włączony + Opóźnienie podświetlenia + Opóźnienie wyłączenia podświetlenia po naciśnięciu przycisku + + Czujniki + Akcelerometr + Używaj danych z kalibracji + Używaj danych z kalibracji akcelerometru. Wykonaj kalibrację po zaznaczeniu tej opcji! + Kalibruj + Połóż telefon na płaskiej powierzchni i naciśnij to, aby skalibrować + Skalibrowano + Akcelerometr został poprawnie skalibrowany. + + Dotyk + Wibracje + Intensywność wibracji + Ustaw intensywność wibracji + + Radio + HSPA + Aktywuj HSDPA/HSUPA + + Stacja dokująca + Dźwięk w stacji dokującej + Użyj stacji dokującej + Użyj pasywnego wyjścia audio w stacji dokującej + From 1c2ca36c3eb9967e03f659cf7d78f155691036ac Mon Sep 17 00:00:00 2001 From: Jorge Ruesga Date: Fri, 12 Apr 2013 23:53:15 +0200 Subject: [PATCH 32/52] DeviceParts: Add uniform title between devices Use "Advanced settings" for all DeviceParts Change-Id: I401e4adfa220279fbf793b847d068e95222abab7 Signed-off-by: Jorge Ruesga --- DeviceSettings/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DeviceSettings/res/values/strings.xml b/DeviceSettings/res/values/strings.xml index 3351cff3..a8485411 100644 --- a/DeviceSettings/res/values/strings.xml +++ b/DeviceSettings/res/values/strings.xml @@ -1,6 +1,6 @@ - Galaxy S II Settings + Advanced settings Screen Colors From e34bb330e1a44aa30f968cb9893f2fc56993d4ec Mon Sep 17 00:00:00 2001 From: djMesias Date: Sat, 13 Apr 2013 09:26:34 +0200 Subject: [PATCH 33/52] i9100: DeviceSettings: ES translations Change-Id: I783e66ff76613ce204a733f4be66e1ea64f638a1 --- DeviceSettings/res/values-es/arrays.xml | 8 +-- DeviceSettings/res/values-es/strings.xml | 80 ++++++++++++------------ 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/DeviceSettings/res/values-es/arrays.xml b/DeviceSettings/res/values-es/arrays.xml index 3666e4eb..26420116 100644 --- a/DeviceSettings/res/values-es/arrays.xml +++ b/DeviceSettings/res/values-es/arrays.xml @@ -24,8 +24,8 @@ Encendido - 2.2 (por defecto) - 1.9 + 2,2 (por defecto) + 1,9 10 @@ -43,8 +43,8 @@ 100% - Solo UMTS - Solo HSDPA + Sólo UMTS + Sólo HSDPA HSDPA + HSUPA diff --git a/DeviceSettings/res/values-es/strings.xml b/DeviceSettings/res/values-es/strings.xml index c3cc2dfc..8d54bfc9 100644 --- a/DeviceSettings/res/values-es/strings.xml +++ b/DeviceSettings/res/values-es/strings.xml @@ -1,43 +1,43 @@ - "Ajustes Galaxy S II" - "Pantalla" - "Colores" - "Escenario" - "Establecer escenario mDNIe" - "Modo" - "Establecer modo mDNIe" - "Modo negativo" - "Habilitar/deshabilitar colores invertidos" - "Modo al aire libre" - "Habilitar/deshabilitar modo al aire libre" - "Gamma" - "Establece el valor Gamma de la pantalla" - "Pantalla táctil" - "Sensibilidad táctil" - "Establecer la sensibilidad del panel táctil" - "Teclas táctiles" - "Habilitar retroiluminación de teclas táctiles" - "Retroiluminación teclas táctiles cuando la pantalla está activa" - "Tiempo de espera de retroiluminación" - "Tiempo tras pulsar una tecla antes de apagar la retroiluminación" - "Sensores" - "Acelerómetro" - "Usar datos de calibración" - "Usar los valores de calibración del acelerómetro. ¡Realizar una calibración después de habilitar esta funcionalidad!" - "Calibrar" - "Poner el teléfono sobre una superficie plana, y presionar este menú para calibrar de nuevo" - "Calibración realizada" - "El sensor ha sido calibrado satisfactoriamente" - "Háptica" - "Vibración" - "Intensidad de vibración" - "Establecer la intensidad de vibración" - "Radio" - "HSPA" - "Habilitar HSDPA/HSUPA" - "Conector" - "Audio" - "Usar el conector de audio USB" - "Usar la salida de audio pasiva cuando el conector USB esté activado" + Ajustes avanzados + Pantalla + Colores + Escenario + Establecer escenario mDNIe + Modo + Establecer modo mDNIe + Modo Negativo + Habilitar/deshabilitar colores invertidos + Modo al aire libre + Habilitar/deshabilitar modo al aire libre + Gamma + Establece el valor Gamma de la pantalla + Pantalla táctil + Sensibilidad táctil + Establecer la sensibilidad del panel táctil + Teclas táctiles + Habilitar retroiluminación de teclas táctiles + Retroiluminación teclas táctiles cuando la pantalla está activa + Tiempo de espera de retroiluminación + Tiempo tras pulsar una tecla antes de apagar la retroiluminación + Sensores + Acelerómetro + Usar datos de calibración + Usar los valores de calibración del acelerómetro. ¡Realizar una calibración después de habilitar esta funcionalidad! + Calibrar + Poner el teléfono sobre una superficie plana, y presionar este menú para calibrar de nuevo + Calibración realizada + El sensor ha sido calibrado satisfactoriamente + Háptica + Vibración + Intensidad de vibración + Establecer la intensidad de vibración + Radio + HSPA + Habilitar HSDPA/HSUPA + Base + Sonido + Usar sonido USB + Utilizar la salida de audio de la base From b729cb1653109dec595201e4b47bf19b8aa9abcf Mon Sep 17 00:00:00 2001 From: DelPETER Date: Mon, 15 Apr 2013 22:43:56 +0200 Subject: [PATCH 34/52] i9100 : fr translation Patch set 2 : clean files Patch set 3 : correction Change-Id: I6a592604205495bcf7bd091ccb18bb2e36fb0101 --- DeviceSettings/res/values-fr/arrays.xml | 75 ++++++++++++++++++++++++ DeviceSettings/res/values-fr/strings.xml | 58 ++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 DeviceSettings/res/values-fr/arrays.xml create mode 100644 DeviceSettings/res/values-fr/strings.xml diff --git a/DeviceSettings/res/values-fr/arrays.xml b/DeviceSettings/res/values-fr/arrays.xml new file mode 100644 index 00000000..a3a2ada3 --- /dev/null +++ b/DeviceSettings/res/values-fr/arrays.xml @@ -0,0 +1,75 @@ + + + + + + Caméra (Défaut) + Vidéo + Vidéo chaude + Vidéo froide + UI + Navigation + Galerie + VT + + + Standard (Défaut) + Dynamique + Naturel + Vidéo + + + Normal + Inversé + + + Désactiver (Défaut) + Activer + + + 2.2 (Défaut) + 1.9 + + + 10 + 20 + 30 + 50 (Défaut) + 70 + 100 + + + 0% + 25% + 50% (Défaut) + 75% + 100% + + + UMTS seulement + HSDPA seulement + HSDPA + HSUPA + + + Jamais + 1 seconde + 2 secondes + 3 secondes (Défaut) + 4 secondes + 5 secondes + 6 secondes + + diff --git a/DeviceSettings/res/values-fr/strings.xml b/DeviceSettings/res/values-fr/strings.xml new file mode 100644 index 00000000..e866ca94 --- /dev/null +++ b/DeviceSettings/res/values-fr/strings.xml @@ -0,0 +1,58 @@ + + + + + Paramètres avancés + Écran + Couleurs + Scénario + Définir le scénario mDNIe + Mode + Définir le mode mDNIe + Mode négatif + Activer/désactiver les couleurs inversées + Mode extérieur + Activer/désactiver le mode extérieur + Gamma écran + Définir la valeur de gamma de l\'écran + Tactile + Sensibilité + Définir la sensibilité du toucher + Tactile + Rétroéclairage + Activer le rétroéclairage des touches lorsque l\'écran est activé + Temps avant extinction + Définir le délai avant l\'extinction des touches + Capteurs + Accéléromètre + Utiliser les données de calibrage + Utiliser les données de calibrage de l\'accéléromètre. Faire un calibrage après avoir coché cette option\u00A0! + Calibrer + Mettez votre téléphone sur une surface plane et appuyez ici pour calibrer + Calibrage terminé + Le capteur a été correctement calibré. + Haptique + Vibreur + Intensité du vibreur + Définir l\'intensité du vibreur + Radio + HSPA + Activer HSDPA/HSUPA + Station d\'accueil + Sortie audio + Sortie audio passive + Utiliser la sortie audio passive de la station d\'accueil + From 6773e1f37224c8a2cdf827e8cca6d56c5a2da45b Mon Sep 17 00:00:00 2001 From: Gustavo Date: Sat, 4 May 2013 18:36:46 -0700 Subject: [PATCH 35/52] i9100: PT-BR translations Change-Id: I04765d38b9c0f4a532be39692d109f02019e5e32 --- DeviceSettings/res/values-pt-rBR/arrays.xml | 0 DeviceSettings/res/values-pt-rBR/strings.xml | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 DeviceSettings/res/values-pt-rBR/arrays.xml mode change 100755 => 100644 DeviceSettings/res/values-pt-rBR/strings.xml diff --git a/DeviceSettings/res/values-pt-rBR/arrays.xml b/DeviceSettings/res/values-pt-rBR/arrays.xml old mode 100755 new mode 100644 diff --git a/DeviceSettings/res/values-pt-rBR/strings.xml b/DeviceSettings/res/values-pt-rBR/strings.xml old mode 100755 new mode 100644 index f821e8bd..1748a7b5 --- a/DeviceSettings/res/values-pt-rBR/strings.xml +++ b/DeviceSettings/res/values-pt-rBR/strings.xml @@ -1,6 +1,6 @@ - Config. Galaxy S II + Configurações avançadas Cores Cenário Define o Cenário mDNIe @@ -38,6 +38,6 @@ O sensor foi calibrado com sucesso. Dock Áudio - Usar Áudio USB do Dock - Usar o áudio de saída passivo no dock + Usar áudio USB do dock + Usar a saída de áudio passiva no dock \ No newline at end of file From 4b6fd3dc12c200549ca47d69530df529db99081b Mon Sep 17 00:00:00 2001 From: Andrew Jiang Date: Fri, 10 May 2013 15:57:00 -0400 Subject: [PATCH 36/52] I9100: Simplified Chinese Translations Changed app_name to read "Advanced Settings", as well as add copyright headers. Change-Id: Ia9a0b98a49b5ce58570951e581500b66ee9866a4 --- DeviceSettings/res/values-zh-rCN/arrays.xml | 18 ++++++++++++++- DeviceSettings/res/values-zh-rCN/strings.xml | 23 ++++++++++++++++---- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/DeviceSettings/res/values-zh-rCN/arrays.xml b/DeviceSettings/res/values-zh-rCN/arrays.xml index d9e9a34e..c55b5402 100644 --- a/DeviceSettings/res/values-zh-rCN/arrays.xml +++ b/DeviceSettings/res/values-zh-rCN/arrays.xml @@ -1,4 +1,20 @@ - + + + 照相 (默认) diff --git a/DeviceSettings/res/values-zh-rCN/strings.xml b/DeviceSettings/res/values-zh-rCN/strings.xml index f3971f20..df08dd25 100644 --- a/DeviceSettings/res/values-zh-rCN/strings.xml +++ b/DeviceSettings/res/values-zh-rCN/strings.xml @@ -1,6 +1,21 @@ - - Galaxy S II 设置 + + + 高级设置 屏幕 颜色 @@ -28,11 +43,11 @@ 感应器 加速规 使用校准数据 - 使用加速规的校准数据. 请在检查此之后重新校准! + 使用加速规的校准数据。请在检查此之后重新校准！ 校准 把手机放在平面上，然后点击此按键进行校准 校准完成 - 感应器已被成功的校准. + 感应器已被成功的校准。 振动 振动器 From f62f6335c9550dfe04158e15c98a7d1f65214bad Mon Sep 17 00:00:00 2001 From: Eddy Witkamp Date: Mon, 13 May 2013 23:26:27 +0200 Subject: [PATCH 37/52] i9100: NL Translation and fix resources ps2: CID Change-Id: I62ded190a5148e731fe6d925c5ab2850b8eed3ad --- DeviceSettings/res/values-nl/arrays.xml | 5 ++--- DeviceSettings/res/values-nl/strings.xml | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/DeviceSettings/res/values-nl/arrays.xml b/DeviceSettings/res/values-nl/arrays.xml index 3e15c113..8dff4991 100644 --- a/DeviceSettings/res/values-nl/arrays.xml +++ b/DeviceSettings/res/values-nl/arrays.xml @@ -1,5 +1,5 @@ - - + Camera (standaard) Video diff --git a/DeviceSettings/res/values-nl/strings.xml b/DeviceSettings/res/values-nl/strings.xml index dba61e17..2872d3ab 100644 --- a/DeviceSettings/res/values-nl/strings.xml +++ b/DeviceSettings/res/values-nl/strings.xml @@ -1,5 +1,5 @@ - - - Galaxy S II-instellingen + + Geavanceerde instellingen Kleuren Scherm From dfb15752bff983b0cd45de453c1c5d40b316247e Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Sat, 25 May 2013 10:23:06 +0200 Subject: [PATCH 38/52] i9100: remove ril blobs Change-Id: I2795943c10740603b3f48b0b45509aefa9125e34 --- proprietary-files.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/proprietary-files.txt b/proprietary-files.txt index 6d73bee8..2bac3a5c 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,5 +1,3 @@ -system/bin/rild -system/lib/libril.so system/lib/libsec-ril.so system/lib/libsecril-client.so system/lib/hw/gps.exynos4.so From 55ab60ce5c14f229d303ef97c2c163e59bfcd08f Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Tue, 21 May 2013 18:05:47 +0200 Subject: [PATCH 39/52] i9100: switch to smdk4412 kernel Change-Id: I9f614c4a23503c8b14daebf7996b076fcd264db8 --- BoardConfig.mk | 4 +-- DeviceSettings/res/values-da/arrays.xml | 7 ++-- DeviceSettings/res/values-de/arrays.xml | 7 ++-- DeviceSettings/res/values-es/arrays.xml | 7 ++-- DeviceSettings/res/values-fi/arrays.xml | 7 ++-- DeviceSettings/res/values-fr/arrays.xml | 11 +++--- DeviceSettings/res/values-fr/strings.xml | 20 +++++------ DeviceSettings/res/values-hu/arrays.xml | 7 ++-- DeviceSettings/res/values-nl/arrays.xml | 7 ++-- DeviceSettings/res/values-pl/arrays.xml | 9 ++--- DeviceSettings/res/values-pt-rBR/arrays.xml | 36 ++++++++++--------- DeviceSettings/res/values-ru/arrays.xml | 8 ++--- DeviceSettings/res/values-zh-rCN/arrays.xml | 7 ++-- DeviceSettings/res/values/arrays.xml | 16 +++++---- DeviceSettings/res/xml/screen_preferences.xml | 2 +- .../settings/device/TouchkeyTimeout.java | 2 +- .../settings/device/mDNIeScenario.java | 2 +- cm.dependencies | 4 +-- 18 files changed, 88 insertions(+), 75 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index a85a3b67..45e0e6b0 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -25,11 +25,11 @@ TARGET_BOARD_INFO_FILE := device/samsung/i9100/board-info.txt BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/i9100/bluetooth # Inline kernel building -TARGET_KERNEL_SOURCE := kernel/samsung/smdk4210 +TARGET_KERNEL_SOURCE := kernel/samsung/smdk4412 TARGET_KERNEL_CONFIG := cyanogenmod_i9100_defconfig TARGET_SPECIFIC_HEADER_PATH += device/samsung/i9100/overlay/include -EXYNOS4210_ENHANCEMENTS := true + # assert TARGET_OTA_ASSERT_DEVICE := galaxys2,i9100,GT-I9100,GT-I9100M,GT-I9100P,GT-I9100T diff --git a/DeviceSettings/res/values-da/arrays.xml b/DeviceSettings/res/values-da/arrays.xml index d3aa9d26..2a63d1ed 100644 --- a/DeviceSettings/res/values-da/arrays.xml +++ b/DeviceSettings/res/values-da/arrays.xml @@ -1,19 +1,20 @@ - Kamera (Standard) + CyanogenMod (Standard) + UI Video Varm Video Kold Video - UI + Kamera Navigation Galleri VT - Standard Dynamisk + Standard (Standard) Naturlig Film diff --git a/DeviceSettings/res/values-de/arrays.xml b/DeviceSettings/res/values-de/arrays.xml index 04797c6a..d3cc471e 100644 --- a/DeviceSettings/res/values-de/arrays.xml +++ b/DeviceSettings/res/values-de/arrays.xml @@ -1,19 +1,20 @@ - Kamera (Standard) + CyanogenMod (Standard) + UI Video Video warm Video kalt - UI + Kamera Navigation Gallerie VT - Standard Dynamisch + Standard (Standard) Natürlich Film diff --git a/DeviceSettings/res/values-es/arrays.xml b/DeviceSettings/res/values-es/arrays.xml index 26420116..412100cc 100644 --- a/DeviceSettings/res/values-es/arrays.xml +++ b/DeviceSettings/res/values-es/arrays.xml @@ -1,17 +1,18 @@ - Cámara (por defecto) + CyanogenMod (por defecto) + UI Vídeo Vídeo cálido Vídeo frío - UI + Camara Navegación Galería VT - Estándar (por defecto) Dinámico + Estándar (por defecto) Natural Película diff --git a/DeviceSettings/res/values-fi/arrays.xml b/DeviceSettings/res/values-fi/arrays.xml index 6db9aa84..e9540256 100644 --- a/DeviceSettings/res/values-fi/arrays.xml +++ b/DeviceSettings/res/values-fi/arrays.xml @@ -1,19 +1,20 @@ - Kamera (Oletus) + CyanogenMod (Oletus) + Käyttöliittymä Video Video(Lämmin) Video(Kylmä) - Käyttöliittymä + Kamera Navigointi Galleria VT - Standardi (Oletus) Dynaaminen + Standardi (Oletus) Luonnollinen Elokuva diff --git a/DeviceSettings/res/values-fr/arrays.xml b/DeviceSettings/res/values-fr/arrays.xml index a3a2ada3..84e3f658 100644 --- a/DeviceSettings/res/values-fr/arrays.xml +++ b/DeviceSettings/res/values-fr/arrays.xml @@ -16,18 +16,19 @@ - Caméra (Défaut) + CyanogenMod (Défaut) + UI Vidéo Vidéo chaude Vidéo froide - UI + Caméra Navigation Galerie VT - Standard (Défaut) Dynamique + Standard (Défaut) Naturel Vidéo @@ -52,7 +53,7 @@ 100 - 0% + Désactivé 25% 50% (Défaut) 75% @@ -64,7 +65,7 @@ HSDPA + HSUPA - Jamais + Désactivé 1 seconde 2 secondes 3 secondes (Défaut) diff --git a/DeviceSettings/res/values-fr/strings.xml b/DeviceSettings/res/values-fr/strings.xml index e866ca94..f4ad5327 100644 --- a/DeviceSettings/res/values-fr/strings.xml +++ b/DeviceSettings/res/values-fr/strings.xml @@ -1,5 +1,5 @@ - - - + Paramètres avancés Écran Couleurs @@ -31,17 +31,17 @@ Tactile Sensibilité Définir la sensibilité du toucher - Tactile + Touches tactiles Rétroéclairage - Activer le rétroéclairage des touches lorsque l\'écran est activé - Temps avant extinction + Activer le rétroéclairage des touches tactiles lorsque l\'écran est activé + Délai avant extinction Définir le délai avant l\'extinction des touches Capteurs Accéléromètre Utiliser les données de calibrage Utiliser les données de calibrage de l\'accéléromètre. Faire un calibrage après avoir coché cette option\u00A0! Calibrer - Mettez votre téléphone sur une surface plane et appuyez ici pour calibrer + Poser le téléphone sur une surface plane puis appuyer ici pour le calibrer Calibrage terminé Le capteur a été correctement calibré. Haptique @@ -52,7 +52,7 @@ HSPA Activer HSDPA/HSUPA Station d\'accueil - Sortie audio - Sortie audio passive - Utiliser la sortie audio passive de la station d\'accueil + Audio + Sortie audio + Utiliser la sortie audio de la station d\'accueil diff --git a/DeviceSettings/res/values-hu/arrays.xml b/DeviceSettings/res/values-hu/arrays.xml index bab1ea54..3363918b 100644 --- a/DeviceSettings/res/values-hu/arrays.xml +++ b/DeviceSettings/res/values-hu/arrays.xml @@ -1,19 +1,20 @@ - Kamera (Alapbeállítás) + CyanogenMod (Alapbeállítás) + Felhasználói felület Videó Videó (Meleg árnyalat) Videó (Hideg árnyalat) - Felhasználói felület + Kamera Navigáció Galéria VT - Hagyományos (Alapbeállítás) Dinamikus + Hagyományos (Alapbeállítás) Természetes Film diff --git a/DeviceSettings/res/values-nl/arrays.xml b/DeviceSettings/res/values-nl/arrays.xml index 8dff4991..52fb1817 100644 --- a/DeviceSettings/res/values-nl/arrays.xml +++ b/DeviceSettings/res/values-nl/arrays.xml @@ -15,18 +15,19 @@ --> - Camera (standaard) + CyanogenMod (Standaard) + Uiterlijk Video Video (warm) Video (koud) - Uiterlijk + Camera Navigatie Galerij VT - Standaard Dynamisch + Standaard (Standaard) Natuurlijk Film diff --git a/DeviceSettings/res/values-pl/arrays.xml b/DeviceSettings/res/values-pl/arrays.xml index 45286a5b..e9554f19 100644 --- a/DeviceSettings/res/values-pl/arrays.xml +++ b/DeviceSettings/res/values-pl/arrays.xml @@ -1,19 +1,20 @@ - Kamera (domyślnie) + CyanogenMod (domyślnie) + UI Wideo Ciepły film Zimny film - UI + Kamera Nawigacja Galeria VT - Dynamicznie (domyślnie) - Standardowo + Dynamicznie + Standardowo (domyślnie) Naturalnie Film diff --git a/DeviceSettings/res/values-pt-rBR/arrays.xml b/DeviceSettings/res/values-pt-rBR/arrays.xml index 3e634d02..accfd51c 100644 --- a/DeviceSettings/res/values-pt-rBR/arrays.xml +++ b/DeviceSettings/res/values-pt-rBR/arrays.xml @@ -1,21 +1,23 @@ - - Câmera (Padrão) - Vídeo - Vídeo Quente - Vídeo Frio - IU - Navegação - Galeria - VT - - - Padrão - Dinâmico - Natural - Filme - + + CyanogenMod (Padrão) + IU + Vídeo + Vídeo Quente + Vídeo Frio + Câmera + Navegação + Galeria + VT + + + + Dinâmico + Padrão (Padrão) + Natural + Filme + Normal Invertido @@ -57,4 +59,4 @@ 5 segundos 6 segundos - \ No newline at end of file + diff --git a/DeviceSettings/res/values-ru/arrays.xml b/DeviceSettings/res/values-ru/arrays.xml index 074cedbc..f3ff76f2 100644 --- a/DeviceSettings/res/values-ru/arrays.xml +++ b/DeviceSettings/res/values-ru/arrays.xml @@ -1,20 +1,20 @@ - Камера (По умолч.) + CyanogenMod (По умолч.) Видео Видео (тёпл.) Видео (хол.) - Интерфейс + Камера Навигация Галерея VT - Стандартный (По умолчанию) Динамический - Естественный + Стандартный (По умолч.) + Натуральный Кино diff --git a/DeviceSettings/res/values-zh-rCN/arrays.xml b/DeviceSettings/res/values-zh-rCN/arrays.xml index c55b5402..849e1f25 100644 --- a/DeviceSettings/res/values-zh-rCN/arrays.xml +++ b/DeviceSettings/res/values-zh-rCN/arrays.xml @@ -17,19 +17,20 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - 照相 (默认) + CyanogenMod (默认) + 界面 影片 影片 (温) 影片 (冷) - 界面 + 相机 导航 图库 VT - 标准 (默认) 动态 + 标准 (默认) 自然 电影 diff --git a/DeviceSettings/res/values/arrays.xml b/DeviceSettings/res/values/arrays.xml index 4ee28de1..6a659f8f 100644 --- a/DeviceSettings/res/values/arrays.xml +++ b/DeviceSettings/res/values/arrays.xml @@ -1,37 +1,39 @@ - Camera (Default) + CyanogenMod (Default) + UI Video Video Warm Video Cold - UI + Camera Navigation Gallery VT - 4 + 0 1 2 3 - 0 + 4 5 6 7 + 8 - Standard (Default) Dynamic + Standard (Default) Natural Movie - 1 0 + 1 2 3 @@ -116,7 +118,7 @@ Never 1 second 2 seconds - 3 seconds (default) + 3 seconds (Default) 4 seconds 5 seconds 6 seconds diff --git a/DeviceSettings/res/xml/screen_preferences.xml b/DeviceSettings/res/xml/screen_preferences.xml index 0b5b54b8..d053bbd9 100644 --- a/DeviceSettings/res/xml/screen_preferences.xml +++ b/DeviceSettings/res/xml/screen_preferences.xml @@ -12,7 +12,7 @@ android:summary="@string/mdnie_scenario_summary_head" android:entries="@array/mdnie_scenario_entries" android:entryValues="@array/mdnie_scenario_entries_values" - android:defaultValue="4" /> + android:defaultValue="0" /> Date: Fri, 10 May 2013 12:57:10 +0200 Subject: [PATCH 40/52] Samsung i9100 : FR translation Consistent translation of Samsung devices Show my ohters commits : http://review.cyanogenmod.org/#/q/owner:%22Delphin+PETER%22+status:open+branch:cm-10.1,n,z Patch set 2 : correction Patch set 3 : correction Patch set 4 : correction Patch set 5 : ? Patch set 6 : rebase Change-Id: Ic096f4ed8f6d6def4a762d85137b7239d52a874b --- DeviceSettings/res/values-fr/arrays.xml | 7 +++---- DeviceSettings/res/values-fr/strings.xml | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/DeviceSettings/res/values-fr/arrays.xml b/DeviceSettings/res/values-fr/arrays.xml index 84e3f658..89fa725a 100644 --- a/DeviceSettings/res/values-fr/arrays.xml +++ b/DeviceSettings/res/values-fr/arrays.xml @@ -1,4 +1,4 @@ - + - - + CyanogenMod (Défaut) UI @@ -37,7 +36,7 @@ Inversé - Désactiver (Défaut) + Désactivé (Défaut) Activer diff --git a/DeviceSettings/res/values-fr/strings.xml b/DeviceSettings/res/values-fr/strings.xml index f4ad5327..38c5e551 100644 --- a/DeviceSettings/res/values-fr/strings.xml +++ b/DeviceSettings/res/values-fr/strings.xml @@ -12,8 +12,7 @@ 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. - --> - +--> Paramètres avancés Écran From 89d4da20bbf45ca2a36aed674b437fae67575b3f Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Mon, 3 Jun 2013 13:26:12 +0200 Subject: [PATCH 41/52] i9100: remove specific header path Change-Id: Ife9c6b4e302353d7789d44ebe688370e29ab2904 --- BoardConfig.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 45e0e6b0..7d2c7042 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -28,8 +28,6 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/i9100/bluetooth TARGET_KERNEL_SOURCE := kernel/samsung/smdk4412 TARGET_KERNEL_CONFIG := cyanogenmod_i9100_defconfig -TARGET_SPECIFIC_HEADER_PATH += device/samsung/i9100/overlay/include - # assert TARGET_OTA_ASSERT_DEVICE := galaxys2,i9100,GT-I9100,GT-I9100M,GT-I9100P,GT-I9100T From 2deaf66c4646e6bca85cd1900798b8bb18cc900c Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Mon, 3 Jun 2013 14:08:27 +0200 Subject: [PATCH 42/52] i9100: fix extract script Change-Id: I64c3bf857027bddb075a156cdfcc9b0982740157 --- extract-files.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/extract-files.sh b/extract-files.sh index 828bd55e..f4e2b6be 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -48,12 +48,7 @@ done # See the License for the specific language governing permissions and # limitations under the License. -# Prebuilt libraries that are needed to build open-source libraries PRODUCT_COPY_FILES := \\ - vendor/__VENDOR__/__DEVICE__/proprietary/system/lib/libril.so:obj/lib/libril.so \\ - vendor/__VENDOR__/__DEVICE__/proprietary/system/lib/libsecril-client.so:obj/lib/libsecril-client.so - -PRODUCT_COPY_FILES += \\ EOF LINEEND=" \\" From 32c24f332a5acf61bb01d1c90eac448ad82cfce5 Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Sun, 9 Jun 2013 10:30:53 +0200 Subject: [PATCH 43/52] i9100: move device settings to common Change-Id: I5c2d1fe1b8e54ffda62650d4c089443705d26f95 --- DeviceSettings/Android.mk | 15 -- DeviceSettings/AndroidManifest.xml | 30 ---- .../drawable/ic_launcher_cmdevicesettings.png | Bin 8207 -> 0 bytes DeviceSettings/res/layout/top.xml | 5 - DeviceSettings/res/values-da/arrays.xml | 69 -------- DeviceSettings/res/values-da/strings.xml | 50 ------ DeviceSettings/res/values-de/arrays.xml | 70 -------- DeviceSettings/res/values-de/strings.xml | 50 ------ DeviceSettings/res/values-es/arrays.xml | 60 ------- DeviceSettings/res/values-es/strings.xml | 43 ----- DeviceSettings/res/values-fi/arrays.xml | 70 -------- DeviceSettings/res/values-fi/strings.xml | 50 ------ DeviceSettings/res/values-fr/arrays.xml | 75 -------- DeviceSettings/res/values-fr/strings.xml | 57 ------ DeviceSettings/res/values-hu/arrays.xml | 70 -------- DeviceSettings/res/values-hu/strings.xml | 50 ------ DeviceSettings/res/values-it/strings.xml | 44 ----- DeviceSettings/res/values-nl/arrays.xml | 75 -------- DeviceSettings/res/values-nl/strings.xml | 64 ------- DeviceSettings/res/values-pl/arrays.xml | 70 -------- DeviceSettings/res/values-pl/strings.xml | 50 ------ DeviceSettings/res/values-pt-rBR/arrays.xml | 62 ------- DeviceSettings/res/values-pt-rBR/strings.xml | 43 ----- DeviceSettings/res/values-ru/arrays.xml | 68 -------- DeviceSettings/res/values-ru/strings.xml | 50 ------ DeviceSettings/res/values-zh-rCN/arrays.xml | 86 ---------- DeviceSettings/res/values-zh-rCN/strings.xml | 65 ------- DeviceSettings/res/values/arrays.xml | 137 --------------- DeviceSettings/res/values/strings.xml | 50 ------ DeviceSettings/res/xml/dock_preferences.xml | 13 -- DeviceSettings/res/xml/haptic_preferences.xml | 13 -- DeviceSettings/res/xml/radio_preferences.xml | 12 -- DeviceSettings/res/xml/screen_preferences.xml | 83 --------- .../res/xml/sensors_preferences.xml | 20 --- .../settings/device/DeviceSettings.java | 162 ------------------ .../settings/device/DockFragmentActivity.java | 72 -------- .../device/HapticFragmentActivity.java | 66 ------- .../com/cyanogenmod/settings/device/Hspa.java | 67 -------- .../settings/device/PanelGamma.java | 60 ------- .../device/RadioFragmentActivity.java | 66 ------- .../device/ScreenFragmentActivity.java | 112 ------------ .../device/SensorsFragmentActivity.java | 84 --------- .../cyanogenmod/settings/device/Startup.java | 39 ----- .../settings/device/TouchkeyTimeout.java | 59 ------- .../device/TouchscreenSensitivity.java | 59 ------- .../cyanogenmod/settings/device/Utils.java | 143 ---------------- .../settings/device/VibratorIntensity.java | 59 ------- .../settings/device/mDNIeMode.java | 59 ------- .../settings/device/mDNIeNegative.java | 59 ------- .../settings/device/mDNIeOutdoor.java | 58 ------- .../settings/device/mDNIeScenario.java | 59 ------- i9100.mk | 2 +- 52 files changed, 1 insertion(+), 3053 deletions(-) delete mode 100644 DeviceSettings/Android.mk delete mode 100644 DeviceSettings/AndroidManifest.xml delete mode 100755 DeviceSettings/res/drawable/ic_launcher_cmdevicesettings.png delete mode 100755 DeviceSettings/res/layout/top.xml delete mode 100644 DeviceSettings/res/values-da/arrays.xml delete mode 100644 DeviceSettings/res/values-da/strings.xml delete mode 100644 DeviceSettings/res/values-de/arrays.xml delete mode 100644 DeviceSettings/res/values-de/strings.xml delete mode 100644 DeviceSettings/res/values-es/arrays.xml delete mode 100644 DeviceSettings/res/values-es/strings.xml delete mode 100644 DeviceSettings/res/values-fi/arrays.xml delete mode 100644 DeviceSettings/res/values-fi/strings.xml delete mode 100644 DeviceSettings/res/values-fr/arrays.xml delete mode 100644 DeviceSettings/res/values-fr/strings.xml delete mode 100644 DeviceSettings/res/values-hu/arrays.xml delete mode 100644 DeviceSettings/res/values-hu/strings.xml delete mode 100644 DeviceSettings/res/values-it/strings.xml delete mode 100644 DeviceSettings/res/values-nl/arrays.xml delete mode 100644 DeviceSettings/res/values-nl/strings.xml delete mode 100644 DeviceSettings/res/values-pl/arrays.xml delete mode 100644 DeviceSettings/res/values-pl/strings.xml delete mode 100644 DeviceSettings/res/values-pt-rBR/arrays.xml delete mode 100644 DeviceSettings/res/values-pt-rBR/strings.xml delete mode 100644 DeviceSettings/res/values-ru/arrays.xml delete mode 100644 DeviceSettings/res/values-ru/strings.xml delete mode 100644 DeviceSettings/res/values-zh-rCN/arrays.xml delete mode 100644 DeviceSettings/res/values-zh-rCN/strings.xml delete mode 100644 DeviceSettings/res/values/arrays.xml delete mode 100644 DeviceSettings/res/values/strings.xml delete mode 100644 DeviceSettings/res/xml/dock_preferences.xml delete mode 100644 DeviceSettings/res/xml/haptic_preferences.xml delete mode 100644 DeviceSettings/res/xml/radio_preferences.xml delete mode 100644 DeviceSettings/res/xml/screen_preferences.xml delete mode 100644 DeviceSettings/res/xml/sensors_preferences.xml delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/DockFragmentActivity.java delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/HapticFragmentActivity.java delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/Hspa.java delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/PanelGamma.java delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/RadioFragmentActivity.java delete mode 100755 DeviceSettings/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/Startup.java delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/TouchkeyTimeout.java delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/TouchscreenSensitivity.java delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/Utils.java delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/VibratorIntensity.java delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeMode.java delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeNegative.java delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeOutdoor.java delete mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeScenario.java diff --git a/DeviceSettings/Android.mk b/DeviceSettings/Android.mk deleted file mode 100644 index 7225f508..00000000 --- a/DeviceSettings/Android.mk +++ /dev/null @@ -1,15 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := GalaxyS2Settings -LOCAL_CERTIFICATE := platform - -include $(BUILD_PACKAGE) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/DeviceSettings/AndroidManifest.xml b/DeviceSettings/AndroidManifest.xml deleted file mode 100644 index f117bb28..00000000 --- a/DeviceSettings/AndroidManifest.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DeviceSettings/res/drawable/ic_launcher_cmdevicesettings.png b/DeviceSettings/res/drawable/ic_launcher_cmdevicesettings.png deleted file mode 100755 index 66de9c39a16e398679a44c88a16c5b685e63d8cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8207 zcmV+qAn@ObP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000#_Nklqa}IhC@BU5QEAsU)u0F*b2*47M@GVJBd-id`U#Ktdo8APJ2$GjHat-F@%L zAKmZ0e%s7wNm3#7RM)(%yU+dZx#xUm=~g1bdt2vCzX!qOn_GR+x8!gpUfayj$)~dG z@khDn(ap*RCA^}>6F~sge6#`)Q1KU1|9H|Zc`ilkvHPmi((WSCAa3LD1S%;7T^dsn zZa-_eoOR>f+<)0Q^e;Vgq%3!$vqD~$FI*=iHOtzy7=y=>68n{RJQrFR={ROy0d9zCA0gnt3F-0@cvC|@!Dmw ztAKO(2sOPXHoPE>p^r6Quup4fDI)PWYKp&QO0|!i+*&HObQ14+U#pQv1Bb zWbc2jfeFDD`c%dgN{?;%)yWN#Fan1 zZs+4WQ8&&-YDRhys3l6tM}NEHuQDcc$Vy*=C$|;cVK*zDr=vl)0cbLop!QR{_7|iE z&D5=OD-`8Yz$_K2nX|G%!RTC&g*re>@IY%-gIEfR1%uT-*-BRB6;KX_<^o5>N7Mj%IbJc=guc=+ zQVgV0DBuNxay3dCL8|_@#v)={)}M4RCaReZsN?}nVAdRfbe;j3d-(~gT$_4guz zQVO@?Q*kW*oPH&M1Qj2^H1nV%swYwkV_;zW1}^amkt`;n0ZLTt4HBbpG)n1&HYFr) z0!>ZFOi$ZN%k+LBrfvrWBx#^Tkd%hNXZ>?8A;+yn#X`3Ll+-&hmN%cei(T8cpxrcD zs|X;aQ7Q&WRqaysJ5_(*^uGbPmYJ7H6(l-8wQIDfSar}b2-5DqNc@{RKq3-rzC$oR z!e+mVgIBG^SS0|JP5_Arj-weK8ROMgU&YIGqpN^ujnWE5ENl&!s_@hStj$G})~Qxc z(-03P8E_Sx`25vt*D;a^mm~nu2S~$fNjMaV!HI!W3RB2Y9$Xfgj94(+2_S1MN`sfl zkWOdtGMTpSJvkz&3i`j|)Ax~oIZnJHz#ACCaouRLLOVG?Vk0HA0#+n~ErO1&FXMyiqMTAbMH zHL{NyKw%vnB?3z81}k&Gw{#XgXA#c)WvJN;Q2nz|*&guHk<>v2Dd&-~VeGDL*ta%g z-+2Rq$^pVh8fRZ>hFt*sW`Ooo16&jORw6!BBUA@+;^rNObM$IBbOmAe3`$lg8KGhz z5J7^NkLe7l-T_j5^T{q=MS3;3<9pz>^_UkQLw3HtpEjs9X`}?Sgn598W`H(Dzcg4= zsk+OgD?A{;oOB*$@v)4B!bD&x7eZ_Y?5I%Va z?Ao^P2&wAitAsKs12EVO&_s>#DS~tQCV({- zjIFcLefhHoFD1O>%j9M)Vvlbrn(3SR>hhkf;vz&EwYy>&pSz6k<9~@AI%N71*3KX8 zHXg5ywcB(8$Qm1k2CfsuDoJiM&E3vhhJWFgm`L|B>RW=ul2XaoEwN8$nYG&jD~$M- ziLOC{i>^XuE|{L24HE%MJCXAYqQzBeUSf5COfADywLyDRJF|laQ91ugDsC4Ofo(9t zZGjMrJF=bh@Ef?JJJ6K^O2DSO2nOcj&ss<@I1kZI=W7a#2NtsZq%Qm-nVY|X%8yRD z#FSFCh~M#2u{gFpQIsYoUA09bGJPiPrYN3s1t!zm0#36==t_a^mmi^f(>hWkZ^ajE zYmf*A=22L7GKC}GkID8;3Q~XXEbQ5TNY|}@57tbPa+E~ILA8w~-8R`3X^b zqIBH3WS+WxQhb!E2H6TxPDA?GHrt?VZ464q^rvQ^r?aTd&_eu`AEa!Au)~s6L50El zf571VKfoQ|wbxG3$&WJd;E$Pk&v(&&sqNDBtxz^X<-`lHGln|LTw~5Orb8s6sx3x( zyb6#BDk9)GIzrYqdX-Ll{=|#GaVeY5;LN=1AL)AOk>;uxHrq?#h*K#oT2T{rV#V2% z79P_^dllJNo@D0j-$DDOw)U}T1o6`3Pq=VOxvRM&V?iuvkz(6~S+1&C)&x=mxatxo zUt;0VB7(&$upM2wFmV6%q~G{`LyTA5c3l2f$~B;v^g%^DOWj^gQ*Omh1IC@oRdY`VB_ALS>ba9X#>5F1;N*s}-TjE0>dbSNpU%kqBaxmNU_u6eel6+I zw_~t{o@ef$wDcsx!Fjdob+5k*lqP@d2PrQ-k-o=oY4K=vl3351>trsw6H!cr{dJQj zop*osLTv87>04~+=alW z`0S3r!u}!rnG0HFr!hY*Vx!M(2Y{+eER5qNrF4{jtsUHcuN-_h zI$oB|Y+3syGA}Gg2(_Y(Ndk**6dvTw=7nK`sODer}zrxm{d~jWt%qx$h zD@D9rTgklmAo`*&VCOC-yWs)c(H&F{Il7JP(ny3=lu@)n&_3l_jb0^Y(#mzCflWc8 z!&wU>4V6~DlX`O_x{$+5MOsohXepSG!iuvS1H$1qN#F7<+&ypOI1XAX@CXM4bHE)&L_#kd2&%}j)UbjgrKSXZjhX^0Kk-qhJqji*e?|Jwpbfrk?Gv6TR zTkN9c*dtbxdigPIraSUnFr*O?~UZMK(ANepLnN1f$n zdt1N(NZt1%yr4uXl_Hf&;kqu4wO^wDo_|4AijA?(YtP|%9rY>0?yN_Qlp1(ApV35W@b4iHQ<0aS`@hYkEf)OT2|9Z$i7+I4nR zQy7UXpE4oco7Ob|q$)+6u!7dkq$v-#IMxKv^LV>nuPw(?xrD#=55VFz0WLZ)|SqhmN~4QAO1Xss!g%9tZh#X0mCN=;0@Yy@#!f-^rI6~P*0uWJ)=O)MI! zQbp?Kss@m$HkycPsCUa0c1V}TI}fa9pbmz1$esF$2G9V4BUjhlZpSRa(vuo_(cHyU z-gi3rd>%<>2~Yndp{0e32~aYEvv@h-@-;1*Pm%*A%IA`ZLRyGoL&AO^T`N)Dk9_zw=cVB1>qsf8+wEW?))eE|Me>L=+62q zclD9G>}wPbJ{p@ynu(WY{Dcb`JLB?3>hRFbWPflq>5UIz4?2wTRp&A0TP7=%}y0Er)kle*zCZF4dyZbGqtB+vT{Fdd2SW-{lNh&Dec^<|F^xpa{ z?2I`SKk(VsM#LD1uKTV>=XQZL2~Ab?sz!AZEtnvr0vNy52Gw%X0%$K)W73l@v7N7? z3uCPSiQqY!@c0imcsHHSQab*;4y1F4%97*o4?3(BoR~=mYc8pABzJTN?yKvuJp*Lj z_Bm@kx`WiS_u#&|9(U`81|F0ghm*?2rLrhvCY^|)swR*`Pb=L)xrn>vnYP0DR`8B_ zKe_JNb%9Ml{{ue)6XLx25~?^pWw5HZZA2Bv(YxLt_2?}SH&lrTGIJj3Q_k;Pw|wR4 z$z6PPxhY+1UNDieb`CW{3xSbZsG+9FNvEFsPyA!o(%gmU8zJpEI2Zg0<3GHHzOG0s zvRl`~jbBB!Z^e3PCjRK#Nbg|#CH&MKWbU~hHDeaaggAZ?C*{>NN}YE_lyV8$7-?%r zJ%4}4T(_v?tpl;Ex5lIsfauol4iQ^r&oZ@}7ZLQ^oAF+IzHM=@7z%pcp*R;@K`xi8 zCA+et+sULovdW@k(xHdnB>TOq$lUZdb?qsR6;A*_@NV?b%FNrMU@61|gr)r*nj3{#chAG(QP@i8riG87>n zLf?wDxIu-n|M(s=`ul4sRHYO{H~a;~{&|FeH@Y2n;vKwOzlC~p6RMEIOGTkbH6uAT zHb&;$&!SE`kMY0~N^8wc0-w~wznHu_tEArj5_2Cb$S%OoHv!b;Rt>2(#)6fof6q=6 zApO=Ryr=IbIN`&sT*n9#So%&lm%hOv#&7!`eNw3nN^4Da>}{;IsB{{~(RkZlz!;0l zq#N?lIqT5-sjpy;IEC@RQZ~|-g{RitiW=V5S$3sRiLq5(eGM?%i73`6x5TV^`Zed& zZ~qn-haSg_E3YG1ej2%QrRLpS*NuZ#2dy=Zt5No7q2;xuI%ZGuU+G15{aP1Gp(G)t?M66ssNP5JV# zBblDIUTwq|%1$qR=X{>oYd%8dg-0mA{51ZqH?jF~Bo1(usWdg>Lq7O0_Ewp-Ryjg^exv>zT_*A z%CxP1=0i)-KsG%<&&e0jzvd%2ehDV_V2jb>*V!KE8^ol#D1^dTXepHprcJHCc2i(+ zob=7#gwdVTl(?R>7l{H?6ZjEPtTX`>#AML~A=XAM!1btiFME@=JWKlL-^9Q8Y9!m+ z)=(xJqJ|Y{Qg~el;dDoXHX?*!ERRgx`JwWoq<;QQ)Z3ekG?{9*5#Ns-fh1(YjD=xhWoo4!7uNfoKj8M zC;FsqT$pXgq%Ba4j}rl7q?T#huQuS)1kUaMjC$!Y?E5dlE7_~I9r~@>6w9@e+07VeaM`J&^r^dJ>W)hmI{3+l;vSZH73wJuos! zqK_fAE!x2^f*1?v1VDLsvzl^kC^^f2&kZ~iqo|kGpwGlWrP7A!- zHWj-s6?rpbEEx}$EGS9=@R(K9t1Gysb}#k&gCK8s4fl;brw|(#FuXGUmp6SZgvU z72VC`rg2=CUZ+HM_FPI9QrcmTf?P9`E|0+5^T7sIDn-j-AN!oMdeR5w;(5;X`))gBsyMd(%0?ZG(X)Wn&=RZ-fo9W&g_v*BVFp5O=Y^Bz#LS7 z+;|f}=^5BxD#eU7e|&#fdgp5!w}okxhivmv?j(<(P_&tK)uIuTIa#|GURhLUt(%e- zG&OBv4Pyci4tq>gw94i5$oRwGfAJ?nSF!r1Q5ezi{GfPzP7IvO|F2Erq=v19r6P3@ zRy^pVdpxo4V6tnm*QW8)!1safMBQw%vv+uu(9|*K6w4`jU!d&cd8_BJP2YRK)xZYe zh9acz!*;EPt@lQyEcM<)-lnFL?``h^wC~%04FG&Fehv2(aV!7;002ovPDHLkV1gi( B$jATy diff --git a/DeviceSettings/res/layout/top.xml b/DeviceSettings/res/layout/top.xml deleted file mode 100755 index 744b568c..00000000 --- a/DeviceSettings/res/layout/top.xml +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/DeviceSettings/res/values-da/arrays.xml b/DeviceSettings/res/values-da/arrays.xml deleted file mode 100644 index 2a63d1ed..00000000 --- a/DeviceSettings/res/values-da/arrays.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - CyanogenMod (Standard) - UI - Video - Varm Video - Kold Video - Kamera - Navigation - Galleri - VT - - - - Dynamisk - Standard (Standard) - Naturlig - Film - - - - Normal - Negativ - - - - Fra (Standard) - Til - - - - 2.2 (Standard) - 1.9 - - - - 10 - 20 - 30 - 50 (Standard) - 70 - 100 - - - - 0% - 25% - 50% (Standard) - 75% - 100% - - - - Kun UMTS - Kun HSDPA - HSDPA + HSUPA - - - - Aldrig - 1 sekund - 2 sekunder - 3 sekunder (Standard) - 4 sekunder - 5 sekunder - 6 sekunder - - diff --git a/DeviceSettings/res/values-da/strings.xml b/DeviceSettings/res/values-da/strings.xml deleted file mode 100644 index eb1c6789..00000000 --- a/DeviceSettings/res/values-da/strings.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - Galaxy S II Indstillinger - - Skærm - Farver - Scenarie - Vælg mDNIe-scenarie - Tilstand - Vælg mDNIe-tilstand - Negativ tilstand - Slå negative farver til/fra - Udendørs tilstand - Slå udendørs tilstand til/fra - Gamma - Indstil gamma - - Touchscreen - Følsomhed - Indstil skærmens følsomhed - - Berøringstaster - Brug baggrundslys - Lys tasterne op når skærmen er tændt - Timeout - Tid før lyset slukker - - Sensorer - Accelerometer - Brug data fra kalibrering - Brug værdier fra kalibrering. Udfør kalibrering efter du vælger denne! - Kalibrér - Læg din telefon på en vandret overflade og tryk her for kalibrering - Kalibrering fuldført - Accelerometeret er kalibreret. - - Haptik - Vibrator - Vibrator-styrke - Indstil vibratorens intensitet - - Radio - HSPA - Slå HSDPA/HSUPA til/fra - - Dock - Lyd - Brug Dockens USB lyd - Spil lyden gennem dockens højttaler - diff --git a/DeviceSettings/res/values-de/arrays.xml b/DeviceSettings/res/values-de/arrays.xml deleted file mode 100644 index d3cc471e..00000000 --- a/DeviceSettings/res/values-de/arrays.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - CyanogenMod (Standard) - UI - Video - Video warm - Video kalt - Kamera - Navigation - Gallerie - VT - - - - Dynamisch - Standard (Standard) - Natürlich - Film - - - - Normal - Invertiert - - - - Deaktiviert - Aktiviert - - - - 2.2 (Standard) - 1.9 - - - - 10 - 20 - 30 - 50 (Standard) - 70 - 100 - - - - 0% - 25% - 50% (Standard) - 75% - 100% - - - - Nur UMTS - Nur HSDPA - HSDPA + HSUPA - - - - Niemals - 1 Sekunde - 2 Sekunden - 3 Sekunden (Standard) - 4 Sekunden - 5 Sekunden - 6 Sekunden - - - diff --git a/DeviceSettings/res/values-de/strings.xml b/DeviceSettings/res/values-de/strings.xml deleted file mode 100644 index c1449899..00000000 --- a/DeviceSettings/res/values-de/strings.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - Galaxy S II Einstellungen - - Bildschirm - Farben - mDNIe-Szenario - mDNIe-Szenario auswählen - mDNIe-Modus - mDNIe-Modus auswählen - Negativ - Farben invertieren an/aus - Outdoor - Outdoor-Modus an/aus - Gamma - Gamma Wert - - Touchscreen - Empfindlichkeit - Berührungs-Empfindlichkeit - - Touchkeys - Beleuchtung - Touchkeys leuchten auf während das Display aktiv ist - Beleuchtungs-Timeout - Zeit für die autom. Abschaltung der Touchkey-Beleuchtung - - Sensoren - Beschleunigungssensor - Kalibrierungsdaten - Kalibrierungswerte verwenden\nNach Aktivierung bitte Kalibrierung ausführen - Kalibrieren - Sensor kalibrieren\nZum Starten das Telefon auf eine horizontale, ebene Fläche legen - Kalibrierung beendet - Der Beschleunigungssensor wurde kalibriert - - Haptik - Vibration - Intensität - Vibrations-Intensität - - Mobilfunk - HSPA - HSDPA/HSUPA an/aus - - Dock - Audio - USB-Dock Audio - Passive Audio-Ausgabe des USB-Docks verwenden - diff --git a/DeviceSettings/res/values-es/arrays.xml b/DeviceSettings/res/values-es/arrays.xml deleted file mode 100644 index 412100cc..00000000 --- a/DeviceSettings/res/values-es/arrays.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - CyanogenMod (por defecto) - UI - Vídeo - Vídeo cálido - Vídeo frío - Camara - Navegación - Galería - VT - - - Dinámico - Estándar (por defecto) - Natural - Película - - - Normal - Invertido - - - Apagado (por defecto) - Encendido - - - 2,2 (por defecto) - 1,9 - - - 10 - 20 - 30 - 50 (por defecto) - 70 - 100 - - - 0% - 25% - 50% (por defecto) - 75% - 100% - - - Sólo UMTS - Sólo HSDPA - HSDPA + HSUPA - - - Nunca - 1 segundo - 2 segundos - 3 segundos (por defecto) - 4 segundos - 5 segundos - 6 segundos - - diff --git a/DeviceSettings/res/values-es/strings.xml b/DeviceSettings/res/values-es/strings.xml deleted file mode 100644 index 8d54bfc9..00000000 --- a/DeviceSettings/res/values-es/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - Ajustes avanzados - Pantalla - Colores - Escenario - Establecer escenario mDNIe - Modo - Establecer modo mDNIe - Modo Negativo - Habilitar/deshabilitar colores invertidos - Modo al aire libre - Habilitar/deshabilitar modo al aire libre - Gamma - Establece el valor Gamma de la pantalla - Pantalla táctil - Sensibilidad táctil - Establecer la sensibilidad del panel táctil - Teclas táctiles - Habilitar retroiluminación de teclas táctiles - Retroiluminación teclas táctiles cuando la pantalla está activa - Tiempo de espera de retroiluminación - Tiempo tras pulsar una tecla antes de apagar la retroiluminación - Sensores - Acelerómetro - Usar datos de calibración - Usar los valores de calibración del acelerómetro. ¡Realizar una calibración después de habilitar esta funcionalidad! - Calibrar - Poner el teléfono sobre una superficie plana, y presionar este menú para calibrar de nuevo - Calibración realizada - El sensor ha sido calibrado satisfactoriamente - Háptica - Vibración - Intensidad de vibración - Establecer la intensidad de vibración - Radio - HSPA - Habilitar HSDPA/HSUPA - Base - Sonido - Usar sonido USB - Utilizar la salida de audio de la base - diff --git a/DeviceSettings/res/values-fi/arrays.xml b/DeviceSettings/res/values-fi/arrays.xml deleted file mode 100644 index e9540256..00000000 --- a/DeviceSettings/res/values-fi/arrays.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - CyanogenMod (Oletus) - Käyttöliittymä - Video - Video(Lämmin) - Video(Kylmä) - Kamera - Navigointi - Galleria - VT - - - - Dynaaminen - Standardi (Oletus) - Luonnollinen - Elokuva - - - - Normaali - Käänteinen - - - - Pois päältä (Oletus) - Päällä - - - - 2.2 (Oletus) - 1.9 - - - - 10 - 20 - 30 - 50 (Oletus) - 70 - 100 - - - - 0% - 25% - 50% (Oletus) - 75% - 100% - - - - Vain UMTS - Vain HSDPA - HSDPA + HSUPA - - - - Never - 1 second - 2 seconds - 3 seconds (Oletus) - 4 seconds - 5 seconds - 6 seconds - - - diff --git a/DeviceSettings/res/values-fi/strings.xml b/DeviceSettings/res/values-fi/strings.xml deleted file mode 100644 index 37087f69..00000000 --- a/DeviceSettings/res/values-fi/strings.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - Galaxy S II-asetukset - - Näyttö - Värit - Skenaario - Vaihda mDNIe-skenaario - Tila - Vaihda mDNIe-tila - Negatiivi-tila - Käytä käänteisiä värejä - Ulkoilma-tila - Ota ulkoilma-tila käyttöön - Näytön gamma - Säädä näytön gamma-arvo - - Kosketusnäyttö - Kosketuksen herkkyys - Säädä näytön herkkyyttä - - Kosketusnäppäimet - Ota näppäinten taustavalo käyttöön - Näytön ollessa päällä valot syttyvät - Taustavalon aikakatkaisu - Säädä taustavalon sammumisen aikaväliä kosketuksesta - - Sensorit - Kiihtyvyysanturi - Käytä kalibrointitietoja - Käytä kiihtyvyysanturin kalibrointiarvoja. Kalibroi merkattuasi tämän! - Kalibroi - Aseta puhelin tasaiselle alustalle ja paina tätä kalibroidaksesi - Kalibrointi valmis - Sensori kalibroitu onnistuneesti - - Haptinen - Värinä - Värinän voimakkuus - Säädä värinän voimakkuutta - - Radio - HSPA - Ota HSDPA/HSUPA käyttöön - - Telakka - Audio - Käytä USB-audiotelakkaa - Käytä telakan audioulostuloa - diff --git a/DeviceSettings/res/values-fr/arrays.xml b/DeviceSettings/res/values-fr/arrays.xml deleted file mode 100644 index 89fa725a..00000000 --- a/DeviceSettings/res/values-fr/arrays.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - CyanogenMod (Défaut) - UI - Vidéo - Vidéo chaude - Vidéo froide - Caméra - Navigation - Galerie - VT - - - Dynamique - Standard (Défaut) - Naturel - Vidéo - - - Normal - Inversé - - - Désactivé (Défaut) - Activer - - - 2.2 (Défaut) - 1.9 - - - 10 - 20 - 30 - 50 (Défaut) - 70 - 100 - - - Désactivé - 25% - 50% (Défaut) - 75% - 100% - - - UMTS seulement - HSDPA seulement - HSDPA + HSUPA - - - Désactivé - 1 seconde - 2 secondes - 3 secondes (Défaut) - 4 secondes - 5 secondes - 6 secondes - - diff --git a/DeviceSettings/res/values-fr/strings.xml b/DeviceSettings/res/values-fr/strings.xml deleted file mode 100644 index 38c5e551..00000000 --- a/DeviceSettings/res/values-fr/strings.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - Paramètres avancés - Écran - Couleurs - Scénario - Définir le scénario mDNIe - Mode - Définir le mode mDNIe - Mode négatif - Activer/désactiver les couleurs inversées - Mode extérieur - Activer/désactiver le mode extérieur - Gamma écran - Définir la valeur de gamma de l\'écran - Tactile - Sensibilité - Définir la sensibilité du toucher - Touches tactiles - Rétroéclairage - Activer le rétroéclairage des touches tactiles lorsque l\'écran est activé - Délai avant extinction - Définir le délai avant l\'extinction des touches - Capteurs - Accéléromètre - Utiliser les données de calibrage - Utiliser les données de calibrage de l\'accéléromètre. Faire un calibrage après avoir coché cette option\u00A0! - Calibrer - Poser le téléphone sur une surface plane puis appuyer ici pour le calibrer - Calibrage terminé - Le capteur a été correctement calibré. - Haptique - Vibreur - Intensité du vibreur - Définir l\'intensité du vibreur - Radio - HSPA - Activer HSDPA/HSUPA - Station d\'accueil - Audio - Sortie audio - Utiliser la sortie audio de la station d\'accueil - diff --git a/DeviceSettings/res/values-hu/arrays.xml b/DeviceSettings/res/values-hu/arrays.xml deleted file mode 100644 index 3363918b..00000000 --- a/DeviceSettings/res/values-hu/arrays.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - CyanogenMod (Alapbeállítás) - Felhasználói felület - Videó - Videó (Meleg árnyalat) - Videó (Hideg árnyalat) - Kamera - Navigáció - Galéria - VT - - - - Dinamikus - Hagyományos (Alapbeállítás) - Természetes - Film - - - - Hagyományos - Fordított - - - - Kikapcsolva (Alapbeállítás) - Bekapcsolva - - - - 2.2 (Alapbeállítás) - 1.9 - - - - 10 - 20 - 30 - 50 (Alapbeállítás) - 70 - 100 - - - - 0% - 25% - 50% (Alapbeállítás) - 75% - 100% - - - - UMTS - HSDPA - HSDPA + HSUPA - - - - Soha - 1 másodperc - 2 másodperc - 3 másodperc (Alapbeállítás) - 4 másodperc - 5 másodperc - 6 másodperc - - - diff --git a/DeviceSettings/res/values-hu/strings.xml b/DeviceSettings/res/values-hu/strings.xml deleted file mode 100644 index 1a27b0cf..00000000 --- a/DeviceSettings/res/values-hu/strings.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - Galaxy S II Beállítások - - Kijelző - Színek - Megjelenítés - mDNIe megjelenítési beállítások - Üzemmód - mDNIe üzemmódok - Negatív üzemmód - Fordított színek ki/be - Szabadtéri üzemmód - Szabadtéri üzemmód ki/be - Kijelző gamma-értéke - Kijelző gamma-érték beállítása - - Érintőképernyő - Érzékenység - Érintőképernyő érzékenységének beállítása - - Érintőgombok - Érintőgombok háttérvilágítása - Bekapcsolja az érintőgombok háttérvilágítását bekapcsolt képernyőnél - Háttérvilágítás időkorlátja - Háttérvilágítás késleltetése - - Szenzorok - Giroszkóp - Kalibrálási érték használata - Kalibrálási érték használata. Érdemes újra kalibrálni, ha ez a funkció használatban van! - Kalibrálás - Kalibráláshoz a telefont vízszintes felületre kell helyezni, és megérinteni ezt a gombot - Kalibrálás befejezve - Az érzékelő sikeresen bekalibrálva. - - Érintési visszajelzés - Rezgés - Rezgés erőssége - Rezgés erősségének beállítása - - GSM Rádió - HSPA - HSDPA/HSUPA engedélyezése - - Dokkoló - Dokkoló hangszórók - Dokkoló hangszóróinak használata - Használja a dokkoló passzív hangkimenetét - diff --git a/DeviceSettings/res/values-it/strings.xml b/DeviceSettings/res/values-it/strings.xml deleted file mode 100644 index c32640ca..00000000 --- a/DeviceSettings/res/values-it/strings.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - Impostazioni Galaxy S II - Schermo - Colori - Scenario - Imposta lo scenario mDNIe - Modalità - Imposta la modalità mDNIe - Negativo - Abilita/disabilita i colori invertiti - Esterno - Abilita/disabilita la modalità esterno - Gamma schermo - Imposta il valore gamma dello schermo - Schermo tattile - Sensibilità tocco - Imposta la sensibilità al tocco dello schermo - Tasti a sfioramento - Retroilluminazione - Abilita la retroilluminazione dei tasti a sfioramento quando lo schermo è attivo - Timer retroilluminazione - Imposta l\'intervallo dopo cui la retroilluminazione dei tasti si spegne - Sensori - Accelerometro - Usa dati di calibrazione - Usa i valori di calibrazione dell\'accelerometro. Effettuare una calibrazione dopo aver attivato questa impostazione! - Calibrazione - Posizionare il telefono su una superficie orizzontale piana e premere per effettuare la calibrazione - Calibrazione effettuata - Il sensore è stato correttamente calibrato. - Feedback tattile - Vibratore - Intensità vibrazione - Imposta l\'intensità della vibrazione - Radio - HSPA - Abilita HSDPA/HSUPA - Dock - Audio - Usa USB audio in dock - Usa l\'uscita audio passiva quando in dock - - diff --git a/DeviceSettings/res/values-nl/arrays.xml b/DeviceSettings/res/values-nl/arrays.xml deleted file mode 100644 index 52fb1817..00000000 --- a/DeviceSettings/res/values-nl/arrays.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - CyanogenMod (Standaard) - Uiterlijk - Video - Video (warm) - Video (koud) - Camera - Navigatie - Galerij - VT - - - Dynamisch - Standaard (Standaard) - Natuurlijk - Film - - - Normaal - Omgedraaid - - - Uit (standaard) - Aan - - - 2,2 (standaard) - 1,9 - - - 10 - 20 - 30 - 50 (standaard) - 70 - 100 - - - 0% - 25% - 50% (standaard) - 75% - 100% - - - Alleen UMTS - Alleen HSDPA - HSDPA & HSUPA - - - Nooit - 1 seconde - 2 seconden - 3 seconden (standaard) - 4 seconden - 5 seconden - 6 seconden - - diff --git a/DeviceSettings/res/values-nl/strings.xml b/DeviceSettings/res/values-nl/strings.xml deleted file mode 100644 index 2872d3ab..00000000 --- a/DeviceSettings/res/values-nl/strings.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - Geavanceerde instellingen - - Kleuren - Scherm - Scenario - mDNIe-scenario instellen - Modus - mDNIe-modus instellen - Negatieve modus - Negatieve kleuren in-/uitschakelen - Buitenmodus - Buitenmodus in-/uitschakelen - Schermgamma - Schermgammawaarden instellen - - Aanraakscherm - Aanraakgevoeligheid - Gevoeligheid aanraakscherm instellen - - Aanraakknop - Achtergrondlicht bij knoppen inschakelen - Aanraakknoppen oplichten indien scherm aan is - Time-out achtergrondlicht - Vertraging na druk op een knop voor uitschakelen achtergrondlicht - - Sensoren - Gyroscoop - Kalibratiegegevens gebruiken - Kalibratiewaarden van de gyroscoop gebruiken. Voer hierna a.u.b. een kalibratie uit. - Kalibreren - Plaats de telefoon op een vlakke ondergrond en tik hier om te kalibreren - Kalibratie afgerond - De sensor is succesvol gekalibreerd. - - Trillen - Trillen - Trilintensiteit - Trilintensiteit instellen - - Radio - HSPA - HSDPA/HSUPA inschakelen - - Dock - Geluid - USB-geluidsdock - Passieve geluidsuitgang van het dock gebruiken - diff --git a/DeviceSettings/res/values-pl/arrays.xml b/DeviceSettings/res/values-pl/arrays.xml deleted file mode 100644 index e9554f19..00000000 --- a/DeviceSettings/res/values-pl/arrays.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - CyanogenMod (domyślnie) - UI - Wideo - Ciepły film - Zimny film - Kamera - Nawigacja - Galeria - VT - - - - Dynamicznie - Standardowo (domyślnie) - Naturalnie - Film - - - - Normalnie - Odwrócony - - - - Wyłączony (domyślnie) - Włączony - - - - 2.2 (domyślnie) - 1.9 - - - - 10 - 20 - 30 - 50 (domyślnie) - 70 - 100 - - - - 0% - 25% - 50% (domyślnie) - 75% - 100% - - - - Tylko UMTS - Tylko HSDPA - HSDPA + HSUPA - - - - Nigdy - 1 sekunda - 2 sekundy - 3 sekundy (domyślnie) - 4 sekundy - 5 sekund - 6 sekund - - - diff --git a/DeviceSettings/res/values-pl/strings.xml b/DeviceSettings/res/values-pl/strings.xml deleted file mode 100644 index 054ac080..00000000 --- a/DeviceSettings/res/values-pl/strings.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - Ustawienia Galaxy S II - - Ekran - Kolory - Technologia mDNIe - Ustaw scenariusz mDNIe - Tryb - Ustaw tryb mDNIe - Tryb negatywu - Włącz/wyłącz odwrócone kolory - Tryb plenerowy - Aktywuj/deaktywuj tryb plenerowy - Poziom gamma ekranu - Ustaw poziom gamma ekranu - - Ekran dotykowy - Czułość ekranu dotykowego - Ustaw czułość ekranu dotykowego - - Przyciski dotykowe - Włącz podświetlenie przycisków - Podświetl przyciski kiedy ekran jest włączony - Opóźnienie podświetlenia - Opóźnienie wyłączenia podświetlenia po naciśnięciu przycisku - - Czujniki - Akcelerometr - Używaj danych z kalibracji - Używaj danych z kalibracji akcelerometru. Wykonaj kalibrację po zaznaczeniu tej opcji! - Kalibruj - Połóż telefon na płaskiej powierzchni i naciśnij to, aby skalibrować - Skalibrowano - Akcelerometr został poprawnie skalibrowany. - - Dotyk - Wibracje - Intensywność wibracji - Ustaw intensywność wibracji - - Radio - HSPA - Aktywuj HSDPA/HSUPA - - Stacja dokująca - Dźwięk w stacji dokującej - Użyj stacji dokującej - Użyj pasywnego wyjścia audio w stacji dokującej - diff --git a/DeviceSettings/res/values-pt-rBR/arrays.xml b/DeviceSettings/res/values-pt-rBR/arrays.xml deleted file mode 100644 index accfd51c..00000000 --- a/DeviceSettings/res/values-pt-rBR/arrays.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - CyanogenMod (Padrão) - IU - Vídeo - Vídeo Quente - Vídeo Frio - Câmera - Navegação - Galeria - VT - - - - Dinâmico - Padrão (Padrão) - Natural - Filme - - - Normal - Invertido - - - Desligado (Padrão) - Ligado - - - 2.2 (Padrão) - 1.9 - - - 10 - 20 - 30 - 50 (Padrão) - 70 - 100 - - - 0% - 25% - 50% (Padrão) - 75% - 100% - - - Somente UMTS - Somente HSDPA - HSDPA + HSUPA - - - Nunca - 1 segundo - 2 segundos - 3 segundos (padrão) - 4 segundos - 5 segundos - 6 segundos - - diff --git a/DeviceSettings/res/values-pt-rBR/strings.xml b/DeviceSettings/res/values-pt-rBR/strings.xml deleted file mode 100644 index 1748a7b5..00000000 --- a/DeviceSettings/res/values-pt-rBR/strings.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - Configurações avançadas - Cores - Cenário - Define o Cenário mDNIe - Modo - Define o Modo mDNIe - Modo Negativo - Ativa/Desativa cores invertidas - Modo Ao Ar Livre - Ativa/Desativa modo ao ar livre - Gama da Tela - Define valor da gama da tela - Tela sensível ao toque - Sensitividade do toque - Define a sensitividade do toque na tela - Tecla sensível ao toque - Ativar luz de fundo das teclas - Acender as teclas sensíveis ao toque quando a tela estiver ligada - Tempo limite da luz de fundo - Quanto tempo a luz de fundo irá ficar acesa depois do botão ser pressionado - Sensores - Resposta Tátil - Vibração - Intensidade da Vibração - Define a intensidade da vibração - Rádio - HSPA - Ativa HSDPA/HSUPA - Tela - Acelerômetro - Usar dados de calibragem - Usa os valores dos dados de calibragem. Calibre após marcar isto! - Calibrar - Coloque seu telefone em uma superfície plana, e pressione isto para calibrar - Calibragem terminada - O sensor foi calibrado com sucesso. - Dock - Áudio - Usar áudio USB do dock - Usar a saída de áudio passiva no dock - \ No newline at end of file diff --git a/DeviceSettings/res/values-ru/arrays.xml b/DeviceSettings/res/values-ru/arrays.xml deleted file mode 100644 index f3ff76f2..00000000 --- a/DeviceSettings/res/values-ru/arrays.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - CyanogenMod (По умолч.) - Видео - Видео (тёпл.) - Видео (хол.) - Камера - Навигация - Галерея - VT - - - - Динамический - Стандартный (По умолч.) - Натуральный - Кино - - - - Выкл. (По умолчанию) - Вкл. - - - - Выкл. (По умолчанию) - Вкл. - - - - 2.2 (По умолчанию) - 1.9 - - - - 10 - 20 - 30 - 50 (По умолчанию) - 70 - 100 - - - - 0% - 25% - 50% (По умолчанию) - 75% - 100% - - - - Только UMTS - Только HSDPA - HSDPA + HSUPA - - - - Никогда - 1 секунда - 2 секунды - 3 секунды (По умолчанию) - 4 секунды - 5 секунд - 6 секунд - - diff --git a/DeviceSettings/res/values-ru/strings.xml b/DeviceSettings/res/values-ru/strings.xml deleted file mode 100644 index e444fd57..00000000 --- a/DeviceSettings/res/values-ru/strings.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - Настройки Galaxy S II - - Экран - Цвета - Сценарий - Установка сценария mDNIe - Режим - Установка режима mDNIe - Инверсия - Включить/Выключить инверсию цветов - Повышенная яркость - Включить/Выключить режим повышенной яркости - Гамма - Установка значения цветовой гаммы - - Сенсорный экран - Чувствительность - Установка чувствительности сенсорного экрана - - Сенсорные кнопки - Подсветка кнопок - Включать подсветку сенсорных кнопок при включённом экране - Тайм-аут подсветки - Время до выключения подсветки после последнего нажатия на кнопки - - Датчики - Акселерометр - Использовать данные калибровки - Использовать откалиброванные значения. Необходимо выполнить калибровку! - Калибровка - Положите телефон на ровную поверхность и нажмите эту кнопку. - Калибровка выполнена - Датчик успешно откалиброван - - Отклик - Вибрация - Интенсивность вибрации - Установка интенсивности вибрации - - Модем - HSPA - Включить HSDPA/HSUPA - - Док-станция - Аудио - USB аудио док-станция - Использовать пассивный режим аудио док-станции - diff --git a/DeviceSettings/res/values-zh-rCN/arrays.xml b/DeviceSettings/res/values-zh-rCN/arrays.xml deleted file mode 100644 index 849e1f25..00000000 --- a/DeviceSettings/res/values-zh-rCN/arrays.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - CyanogenMod (默认) - 界面 - 影片 - 影片 (温) - 影片 (冷) - 相机 - 导航 - 图库 - VT - - - - 动态 - 标准 (默认) - 自然 - 电影 - - - - 正常 - 反色 - - - - 禁用 (默认) - 启用 - - - - 2.2 (默认) - 1.9 - - - - 10 - 20 - 30 - 50 (默认) - 70 - 100 - - - - 0% - 25% - 50% (默认) - 75% - 100% - - - - 仅使用 UMTS - 仅使用 HSDPA - 使用 HSDPA + HSUPA - - - - 从不 - 1 秒 - 2 秒 - 3 秒 (默认) - 4 秒 - 5 秒 - 6 秒 - - - diff --git a/DeviceSettings/res/values-zh-rCN/strings.xml b/DeviceSettings/res/values-zh-rCN/strings.xml deleted file mode 100644 index df08dd25..00000000 --- a/DeviceSettings/res/values-zh-rCN/strings.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - 高级设置 - - 屏幕 - 颜色 - 场景 - 设置 mDNIe 场景 - 模式 - 设置 mDNIe 模式 - 负极模式 - 启用/禁用反色 - 户外模式 - 启用/禁用户外模式 - 屏幕珈玛 - 设置屏幕珈玛 - - 触摸屏 - 触摸屏灵敏度 - 设置触摸屏灵敏度 - - 触摸键 - 启用触摸键背光灯 - 屏幕开启时触摸键将会点亮 - 背光灯超时 - 设置背光灯超时时间 - - 感应器 - 加速规 - 使用校准数据 - 使用加速规的校准数据。请在检查此之后重新校准！ - 校准 - 把手机放在平面上，然后点击此按键进行校准 - 校准完成 - 感应器已被成功的校准。 - - 振动 - 振动器 - 振动器强度 - 设置振动器强度 - - 无线电 - HSPA - 启用 HSDPA/HSUPA - - 基座 - 音频 - 使用基座的 USB 音频 - 使用基座上的被动音频输出 - diff --git a/DeviceSettings/res/values/arrays.xml b/DeviceSettings/res/values/arrays.xml deleted file mode 100644 index 6a659f8f..00000000 --- a/DeviceSettings/res/values/arrays.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - - CyanogenMod (Default) - UI - Video - Video Warm - Video Cold - Camera - Navigation - Gallery - VT - - - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - - - - Dynamic - Standard (Default) - Natural - Movie - - - - 0 - 1 - 2 - 3 - - - - Normal - Inverted - - - - 0 - 1 - - - - Off (Default) - On - - - - 0 - 1 - - - - 2.2 (Default) - 1.9 - - - - 0 - 1 - - - - 10 - 20 - 30 - 50 (Default) - 70 - 100 - - - - 10 - 20 - 30 - 50 - 70 - 100 - - - - 0% - 25% - 50% (Default) - 75% - 100% - - - - 0 - 25 - 50 - 75 - 100 - - - - UMTS Only - HSDPA Only - HSDPA + HSUPA - - - - 21 - 22 - 23 - - - - Never - 1 second - 2 seconds - 3 seconds (Default) - 4 seconds - 5 seconds - 6 seconds - - - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - - - diff --git a/DeviceSettings/res/values/strings.xml b/DeviceSettings/res/values/strings.xml deleted file mode 100644 index a8485411..00000000 --- a/DeviceSettings/res/values/strings.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - Advanced settings - - Screen - Colors - Scenario - Set the mDNIe Scenario - Mode - Set the mDNIe Mode - Negative Mode - Enable/Disable inverted colors - Outdoor Mode - Enable/Disable outdoor mode - Screen Gamma - Set screen gamma value - - Touchscreen - Touch sensitivity - Set touch panel sensitivity - - Touchkeys - Enable keys backlight - Light up touchkeys when screen is on - Backlight timeout - Delay after a keypress before backlight turns off - - Sensors - Accelerometer - Use calibration data - Use the accelerometer calibration values. Do a calibration after checking this! - Calibrate - Put your phone on a flat surface, and press this to calibrate - Calibration done - The sensor has been successfully calibrated. - - Haptic - Vibrator - Vibrator Intensity - Set vibrator intensity - - Radio - HSPA - Enable HSDPA/HSUPA - - Dock - Audio - Use Dock USB Audio - Use the passive audio out on the dock - diff --git a/DeviceSettings/res/xml/dock_preferences.xml b/DeviceSettings/res/xml/dock_preferences.xml deleted file mode 100644 index 5f5fdf4d..00000000 --- a/DeviceSettings/res/xml/dock_preferences.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - diff --git a/DeviceSettings/res/xml/haptic_preferences.xml b/DeviceSettings/res/xml/haptic_preferences.xml deleted file mode 100644 index 31c0e21b..00000000 --- a/DeviceSettings/res/xml/haptic_preferences.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/DeviceSettings/res/xml/radio_preferences.xml b/DeviceSettings/res/xml/radio_preferences.xml deleted file mode 100644 index b78ecde1..00000000 --- a/DeviceSettings/res/xml/radio_preferences.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/DeviceSettings/res/xml/screen_preferences.xml b/DeviceSettings/res/xml/screen_preferences.xml deleted file mode 100644 index d053bbd9..00000000 --- a/DeviceSettings/res/xml/screen_preferences.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DeviceSettings/res/xml/sensors_preferences.xml b/DeviceSettings/res/xml/sensors_preferences.xml deleted file mode 100644 index 8c61e076..00000000 --- a/DeviceSettings/res/xml/sensors_preferences.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java b/DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java deleted file mode 100644 index 7f7970cd..00000000 --- a/DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Copyright (C) 2012 The CyanogenMod Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cyanogenmod.settings.device; - -import android.app.ActionBar; -import android.app.ActionBar.Tab; -import android.app.Activity; -import android.app.Fragment; -import android.app.FragmentTransaction; -import android.content.Context; -import android.os.Bundle; -import android.support.v4.app.FragmentActivity; -import android.support.v13.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; - -import com.cyanogenmod.settings.device.R; - -import java.util.ArrayList; - -public class DeviceSettings extends FragmentActivity { - - public static final String SHARED_PREFERENCES_BASENAME = "com.cyanogenmod.settings.device"; - public static final String ACTION_UPDATE_PREFERENCES = "com.cyanogenmod.settings.device.UPDATE"; - public static final String KEY_MDNIE_SCENARIO = "mdnie_scenario"; - public static final String KEY_MDNIE_MODE = "mdnie_mode"; - public static final String KEY_MDNIE_NEGATIVE = "mdnie_negative"; - public static final String KEY_MDNIE_OUTDOOR = "mdnie_outdoor"; - public static final String KEY_PANEL_GAMMA = "panel_gamma"; - public static final String KEY_HSPA = "hspa"; - public static final String KEY_USE_ACCELEROMETER_CALIBRATION = "use_accelerometer_calibration"; - public static final String KEY_CALIBRATE_ACCELEROMETER = "calibrate_accelerometer"; - public static final String KEY_TOUCHSCREEN_SENSITIVITY = "touchscreen_sensitivity"; - public static final String KEY_TOUCHKEY_LIGHT = "touchkey_light"; - public static final String KEY_TOUCHKEY_TIMEOUT = "touchkey_timeout"; - public static final String KEY_VIBRATOR_INTENSITY = "vibrator_intensity"; - public static final String KEY_USE_DOCK_AUDIO = "dock_audio"; - - ViewPager mViewPager; - TabsAdapter mTabsAdapter; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - mViewPager = new ViewPager(this); - mViewPager.setId(R.id.viewPager); - setContentView(mViewPager); - - final ActionBar bar = getActionBar(); - bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); - bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE, ActionBar.DISPLAY_SHOW_TITLE); - bar.setTitle(R.string.app_name); - - mTabsAdapter = new TabsAdapter(this, mViewPager); - mTabsAdapter.addTab(bar.newTab().setText(R.string.category_radio_title), - RadioFragmentActivity.class, null); - mTabsAdapter.addTab(bar.newTab().setText(R.string.category_screen_title), - ScreenFragmentActivity.class, null); - mTabsAdapter.addTab(bar.newTab().setText(R.string.category_sensors_title), - SensorsFragmentActivity.class, null); - mTabsAdapter.addTab(bar.newTab().setText(R.string.category_haptic_title), - HapticFragmentActivity.class, null); - mTabsAdapter.addTab(bar.newTab().setText(R.string.category_dock_title), - DockFragmentActivity.class, null); - - if (savedInstanceState != null) { - bar.setSelectedNavigationItem(savedInstanceState.getInt("tab", 0)); - } - } - - @Override - protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - outState.putInt("tab", getActionBar().getSelectedNavigationIndex()); - } - - public static class TabsAdapter extends FragmentPagerAdapter - implements ActionBar.TabListener, ViewPager.OnPageChangeListener { - private final Context mContext; - private final ActionBar mActionBar; - private final ViewPager mViewPager; - private final ArrayList mTabs = new ArrayList(); - - static final class TabInfo { - private final Class clss; - private final Bundle args; - - TabInfo(Class _class, Bundle _args) { - clss = _class; - args = _args; - } - } - - public TabsAdapter(Activity activity, ViewPager pager) { - super(activity.getFragmentManager()); - mContext = activity; - mActionBar = activity.getActionBar(); - mViewPager = pager; - mViewPager.setAdapter(this); - mViewPager.setOnPageChangeListener(this); - } - - public void addTab(ActionBar.Tab tab, Class clss, Bundle args) { - TabInfo info = new TabInfo(clss, args); - tab.setTag(info); - tab.setTabListener(this); - mTabs.add(info); - mActionBar.addTab(tab); - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mTabs.size(); - } - - @Override - public Fragment getItem(int position) { - TabInfo info = mTabs.get(position); - return Fragment.instantiate(mContext, info.clss.getName(), info.args); - } - - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - } - - public void onPageSelected(int position) { - mActionBar.setSelectedNavigationItem(position); - } - - public void onPageScrollStateChanged(int state) { - } - - public void onTabSelected(Tab tab, FragmentTransaction ft) { - Object tag = tab.getTag(); - for (int i=0; i Date: Sun, 21 Jul 2013 15:57:17 +0200 Subject: [PATCH 44/52] i9100: recovery: auto detect fstype for sdcard Change-Id: I54c299fa684c0e076bf2dec0ca3c513ca6069fe9 --- recovery.fstab | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recovery.fstab b/recovery.fstab index a210f6a9..36644be3 100644 --- a/recovery.fstab +++ b/recovery.fstab @@ -9,5 +9,5 @@ /data ext4 /dev/block/mmcblk0p10 /preload ext4 /dev/block/mmcblk0p12 -/emmc vfat /dev/block/mmcblk0p11 -/sdcard vfat /dev/block/mmcblk1p1 fstype2=ext4 +/emmc auto /dev/block/mmcblk0p11 +/sdcard auto /dev/block/mmcblk1p1 /dev/block/mmcblk1 From e8d293c107febbaa39ce91eb0df07232bc148b35 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Sun, 4 Aug 2013 16:48:05 +0200 Subject: [PATCH 45/52] i9100: recovery: use unified fstab Change-Id: I15bc2d1a405f70610a195073fa010f750aec0544 --- recovery.fstab | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 recovery.fstab diff --git a/recovery.fstab b/recovery.fstab deleted file mode 100644 index 36644be3..00000000 --- a/recovery.fstab +++ /dev/null @@ -1,13 +0,0 @@ -# mount point fstype device - -/boot emmc /dev/block/mmcblk0p5 -/recovery emmc /dev/block/mmcblk0p6 - -/efs ext4 /dev/block/mmcblk0p1 -/cache ext4 /dev/block/mmcblk0p7 -/system ext4 /dev/block/mmcblk0p9 -/data ext4 /dev/block/mmcblk0p10 -/preload ext4 /dev/block/mmcblk0p12 - -/emmc auto /dev/block/mmcblk0p11 -/sdcard auto /dev/block/mmcblk1p1 /dev/block/mmcblk1 From 4ed92947837f6d5534c6dbc2bdf64c32f322cb5e Mon Sep 17 00:00:00 2001 From: codeworkx Date: Fri, 9 Aug 2013 19:44:57 +0200 Subject: [PATCH 46/52] i9100: remove DeviceSettings Change-Id: Ie0594f50e4f88fe3aeda5ffc0d6f268d879d4592 --- i9100.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/i9100.mk b/i9100.mk index 29270e97..bd8fc37b 100644 --- a/i9100.mk +++ b/i9100.mk @@ -30,10 +30,6 @@ PRODUCT_LOCALES += hdpi PRODUCT_PROPERTY_OVERRIDES += \ ro.sf.lcd_density=240 -# Packages -PRODUCT_PACKAGES += \ - DeviceSettings - # Sensors PRODUCT_PACKAGES += \ sensors.exynos4 From 4de212f1d34b33041962bfa295c366690571ab15 Mon Sep 17 00:00:00 2001 From: Andrew Jiang Date: Thu, 22 Aug 2013 07:54:58 -0400 Subject: [PATCH 47/52] I9100: Enable home button wake setting Patch Set 2: Fix ub0r derp. Change-Id: I759d4f79dc1d5f9df31063f76855fd5766e32cae --- .../apps/Settings/res/values/config.xml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 overlay/packages/apps/Settings/res/values/config.xml diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/overlay/packages/apps/Settings/res/values/config.xml new file mode 100644 index 00000000..23515271 --- /dev/null +++ b/overlay/packages/apps/Settings/res/values/config.xml @@ -0,0 +1,21 @@ + + + + + + true + From 9aa6b3653f288bc40a4279f8522d9320adc3337f Mon Sep 17 00:00:00 2001 From: Pavel Kirpichyov Date: Wed, 13 Nov 2013 10:53:32 +0400 Subject: [PATCH 48/52] fix sensors struct Change-Id: I12bbefc83ef2eb2bd0db78a688de2860b517ef01 --- libsensors/sensors.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libsensors/sensors.cpp b/libsensors/sensors.cpp index c048a146..d57f65ad 100644 --- a/libsensors/sensors.cpp +++ b/libsensors/sensors.cpp @@ -69,27 +69,27 @@ static const struct sensor_t sSensorList[] = { { "KR3DM 3-axis Accelerometer", "STMicroelectronics", 1, SENSORS_ACCELERATION_HANDLE, - SENSOR_TYPE_ACCELEROMETER, RANGE_A, CONVERT_A, 0.23f, 20000, { } }, + SENSOR_TYPE_ACCELEROMETER, RANGE_A, CONVERT_A, 0.23f, 20000, 0, 0, { } }, { "AK8975 3-axis Magnetic field sensor", "Asahi Kasei Microdevices", 1, SENSORS_MAGNETIC_FIELD_HANDLE, - SENSOR_TYPE_MAGNETIC_FIELD, 2000.0f, CONVERT_M, 6.8f, 16667, { } }, + SENSOR_TYPE_MAGNETIC_FIELD, 2000.0f, CONVERT_M, 6.8f, 16667, 0, 0, { } }, { "AK8973 Orientation sensor", "Asahi Kasei Microdevices", 1, SENSORS_ORIENTATION_HANDLE, - SENSOR_TYPE_ORIENTATION, 360.0f, CONVERT_O, 7.8f, 16667, { } }, + SENSOR_TYPE_ORIENTATION, 360.0f, CONVERT_O, 7.8f, 16667, 0, 0, { } }, { "CM3663 Light sensor", "Capella Microsystems", 1, SENSORS_LIGHT_HANDLE, - SENSOR_TYPE_LIGHT, 10240.0f, 1.0f, 0.75f, 0, { } }, + SENSOR_TYPE_LIGHT, 10240.0f, 1.0f, 0.75f, 0, 0, 0, { } }, { "CM3663 Proximity sensor", "Capella Microsystems", 1, SENSORS_PROXIMITY_HANDLE, - SENSOR_TYPE_PROXIMITY, 5.0f, 5.0f, 0.75f, 0, { } }, + SENSOR_TYPE_PROXIMITY, 5.0f, 5.0f, 0.75f, 0, 0, 0, { } }, { "K3G Gyroscope sensor", "STMicroelectronics", 1, SENSORS_GYROSCOPE_HANDLE, - SENSOR_TYPE_GYROSCOPE, RANGE_GYRO, CONVERT_GYRO, 6.1f, 1190, { } }, + SENSOR_TYPE_GYROSCOPE, RANGE_GYRO, CONVERT_GYRO, 6.1f, 1190, 0, 0, { } }, }; From 31ef284f1e8edc01b64a526871fe9ff6ded73c3f Mon Sep 17 00:00:00 2001 From: Pavel Kirpichyov Date: Wed, 13 Nov 2013 10:54:57 +0400 Subject: [PATCH 49/52] Remove extra framework res entries Change-Id: I6021a541334248f80026abb0b3364ccf2c8dd235 --- overlay/frameworks/base/core/res/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index a4ef745e..14302773 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -155,6 +155,6 @@ 7 - false + From 9c4bf84393ce1259d77b6ba21a06856a179566a0 Mon Sep 17 00:00:00 2001 From: Eddy Witkamp Date: Fri, 27 Dec 2013 18:54:39 +0100 Subject: [PATCH 50/52] Add support for "SC-02C" Change-Id: Ife430342c9ad2e61860f0781b973eeb8d003f68d (cherry picked from commit a2e147021247aa969011762b9159bdf13addb06f) --- BoardConfig.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 7d2c7042..8d6d77f8 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -29,7 +29,7 @@ TARGET_KERNEL_SOURCE := kernel/samsung/smdk4412 TARGET_KERNEL_CONFIG := cyanogenmod_i9100_defconfig # assert -TARGET_OTA_ASSERT_DEVICE := galaxys2,i9100,GT-I9100,GT-I9100M,GT-I9100P,GT-I9100T +TARGET_OTA_ASSERT_DEVICE := galaxys2,i9100,GT-I9100,GT-I9100M,GT-I9100P,GT-I9100T,SC-02C # Use the non-open-source parts, if they're present -include vendor/samsung/i9100/BoardConfigVendor.mk From 03283a4630eace5af6ac3de9f2bff17adc0521c8 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Sun, 2 Feb 2014 04:09:18 +0000 Subject: [PATCH 51/52] Updated build signatures from latest stock Change-Id: I3aaf046c0e040f657ebb7b10103afb9566436110 --- BoardConfig.mk | 2 +- cm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 8d6d77f8..d4b60c4f 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -29,7 +29,7 @@ TARGET_KERNEL_SOURCE := kernel/samsung/smdk4412 TARGET_KERNEL_CONFIG := cyanogenmod_i9100_defconfig # assert -TARGET_OTA_ASSERT_DEVICE := galaxys2,i9100,GT-I9100,GT-I9100M,GT-I9100P,GT-I9100T,SC-02C +TARGET_OTA_ASSERT_DEVICE := galaxys2,i9100,GT-I9100,GT-I9100M,GT-I9100P,GT-I9100T,SC-02C # Use the non-open-source parts, if they're present -include vendor/samsung/i9100/BoardConfigVendor.mk diff --git a/cm.mk b/cm.mk index b12550d2..1f58b3ff 100644 --- a/cm.mk +++ b/cm.mk @@ -37,4 +37,4 @@ PRODUCT_BRAND := Samsung PRODUCT_MODEL := GT-I9100 # Set build fingerprint / ID / Prduct Name ect. -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-I9100 TARGET_DEVICE=GT-I9100 BUILD_FINGERPRINT=samsung/GT-I9100/GT-I9100:4.0.3/IML74K/XXLPQ:user/release-keys PRIVATE_BUILD_DESC="GT-I9100-user 4.0.3 IML74K XXLPQ release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-I9100 TARGET_DEVICE=GT-I9100 BUILD_FINGERPRINT=samsung/GT-I9100/GT-I9100:4.1.2/JZO54K/I9100XWMS2:user/release-keys PRIVATE_BUILD_DESC="GT-I9100-user 4.1.2 JZO54K I9100XWMS2 release-keys" From 101c55d0b91557fa7a46b611b06fb343b5321936 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Thu, 4 Sep 2014 17:54:36 +0100 Subject: [PATCH 52/52] sensors: Force a minimum interval between gyro state changes The gyroscope will mess up the entire sensor pile if it gets deactivated less than around 150 msec after it's enabled, which does happen with some overly aggressive apps. Prevent this simply by delaying all gyro disablements by 200 msec. Change-Id: I8212a8aa4beb22a241ed63cc8d1471b4fea3d0b6 --- libsensors/sensors.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libsensors/sensors.cpp b/libsensors/sensors.cpp index d57f65ad..e393cd52 100644 --- a/libsensors/sensors.cpp +++ b/libsensors/sensors.cpp @@ -210,6 +210,9 @@ sensors_poll_context_t::~sensors_poll_context_t() { int sensors_poll_context_t::activate(int handle, int enabled) { int index = handleToDriver(handle); if (index < 0) return index; + if (index == gyro && enabled == 0) { + usleep(200*1000); + } int err = mSensors[index]->enable(handle, enabled); if (enabled && !err) { const char wakeMessage(WAKE_MESSAGE); @@ -311,7 +314,7 @@ static int open_sensors(const struct hw_module_t* module, const char* id, memset(&dev->device, 0, sizeof(sensors_poll_device_t)); dev->device.common.tag = HARDWARE_DEVICE_TAG; - dev->device.common.version = 0; + dev->device.common.version = SENSORS_DEVICE_API_VERSION_0_1; dev->device.common.module = const_cast(module); dev->device.common.close = poll__close; dev->device.activate = poll__activate;