summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DeviceSettings/res/values-it/strings.xml44
-rw-r--r--DeviceSettings/res/values-zh-rCN/arrays.xml69
-rw-r--r--DeviceSettings/res/values-zh-rCN/strings.xml50
-rw-r--r--cm.dependencies3
-rw-r--r--proprietary-common-files.txt2
-rwxr-xr-xproprietary-files.sh6
6 files changed, 168 insertions, 6 deletions
diff --git a/DeviceSettings/res/values-it/strings.xml b/DeviceSettings/res/values-it/strings.xml
new file mode 100644
index 0000000..c32640c
--- /dev/null
+++ b/DeviceSettings/res/values-it/strings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="app_name">Impostazioni Galaxy S II</string>
+ <string name="category_screen_title">Schermo</string>
+ <string name="screen_colors_title">Colori</string>
+ <string name="mdnie_scenario_title_head">Scenario</string>
+ <string name="mdnie_scenario_summary_head">Imposta lo scenario mDNIe</string>
+ <string name="mdnie_mode_title_head">Modalità</string>
+ <string name="mdnie_mode_summary_head">Imposta la modalità mDNIe</string>
+ <string name="mdnie_negative_title_head">Negativo</string>
+ <string name="mdnie_negative_summary_head">Abilita/disabilita i colori invertiti</string>
+ <string name="mdnie_outdoor_title_head">Esterno</string>
+ <string name="mdnie_outdoor_summary_head">Abilita/disabilita la modalità esterno</string>
+ <string name="panel_gamma_title_head">Gamma schermo</string>
+ <string name="panel_gamma_summary_head">Imposta il valore gamma dello schermo</string>
+ <string name="touchscreen_subcat_title">Schermo tattile</string>
+ <string name="touchscreen_sensitivity_title_head">Sensibilità tocco</string>
+ <string name="touchscreen_sensitivity_summary_head">Imposta la sensibilità al tocco dello schermo</string>
+ <string name="touchkey_subcat_title">Tasti a sfioramento</string>
+ <string name="touchkey_light_title_head">Retroilluminazione</string>
+ <string name="touchkey_light_summary_head">Abilita la retroilluminazione dei tasti a sfioramento quando lo schermo è attivo</string>
+ <string name="touchkey_timeout_title_head">Timer retroilluminazione</string>
+ <string name="touchkey_timeout_summary_head">Imposta l\'intervallo dopo cui la retroilluminazione dei tasti si spegne</string>
+ <string name="category_sensors_title">Sensori</string>
+ <string name="accelerometer_subcat_title">Accelerometro</string>
+ <string name="use_accelerometer_calibration_title_head">Usa dati di calibrazione</string>
+ <string name="use_accelerometer_calibration_summary_head">Usa i valori di calibrazione dell\'accelerometro. Effettuare una calibrazione dopo aver attivato questa impostazione!</string>
+ <string name="calibrate_accelerometer_title_head">Calibrazione</string>
+ <string name="calibrate_accelerometer_summary_head">Posizionare il telefono su una superficie orizzontale piana e premere per effettuare la calibrazione</string>
+ <string name="accelerometer_dialog_head">Calibrazione effettuata</string>
+ <string name="accelerometer_dialog_message">Il sensore è stato correttamente calibrato.</string>
+ <string name="category_haptic_title">Feedback tattile</string>
+ <string name="vibrator_subcat_title">Vibratore</string>
+ <string name="vibrator_intensity_title_head">Intensità vibrazione</string>
+ <string name="vibrator_intensity_summary_head">Imposta l\'intensità della vibrazione</string>
+ <string name="category_radio_title">Radio</string>
+ <string name="hspa_title_head">HSPA</string>
+ <string name="hspa_summary_head">Abilita HSDPA/HSUPA</string>
+ <string name="category_dock_title">Dock</string>
+ <string name="dockaudio_subcat_title">Audio</string>
+ <string name="use_dock_audio_title_head">Usa USB audio in dock</string>
+ <string name="use_dock_audio_summary_head">Usa l\'uscita audio passiva quando in dock</string>
+</resources>
+
diff --git a/DeviceSettings/res/values-zh-rCN/arrays.xml b/DeviceSettings/res/values-zh-rCN/arrays.xml
new file mode 100644
index 0000000..d9e9a34
--- /dev/null
+++ b/DeviceSettings/res/values-zh-rCN/arrays.xml
@@ -0,0 +1,69 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <string-array name="mdnie_scenario_entries">
+ <item>照相 (默认)</item>
+ <item>影片</item>
+ <item>影片 (温)</item>
+ <item>影片 (冷)</item>
+ <item>界面</item>
+ <item>导航</item>
+ <item>图库</item>
+ <item>VT</item>
+ </string-array>
+
+ <string-array name="mdnie_mode_entries">
+ <item>标准 (默认)</item>
+ <item>动态</item>
+ <item>自然</item>
+ <item>电影</item>
+ </string-array>
+
+ <string-array name="mdnie_negative_entries">
+ <item>正常</item>
+ <item>反色</item>
+ </string-array>
+
+ <string-array name="mdnie_outdoor_entries">
+ <item>禁用 (默认)</item>
+ <item>启用</item>
+ </string-array>
+
+ <string-array name="panel_gamma_entries">
+ <item>2.2 (默认)</item>
+ <item>1.9</item>
+ </string-array>
+
+ <string-array name="touchscreen_sensitivity_entries">
+ <item>10</item>
+ <item>20</item>
+ <item>30</item>
+ <item>50 (默认)</item>
+ <item>70</item>
+ <item>100</item>
+ </string-array>
+
+ <string-array name="vibrator_intensity_entries">
+ <item>0%</item>
+ <item>25%</item>
+ <item>50% (默认)</item>
+ <item>75%</item>
+ <item>100%</item>
+ </string-array>
+
+ <string-array name="hspa_entries">
+ <item>仅使用 UMTS</item>
+ <item>仅使用 HSDPA</item>
+ <item>使用 HSDPA + HSUPA</item>
+ </string-array>
+
+ <string-array name="touchkey_timeout_entries">
+ <item>从不</item>
+ <item>1 秒</item>
+ <item>2 秒</item>
+ <item>3 秒 (默认)</item>
+ <item>4 秒</item>
+ <item>5 秒</item>
+ <item>6 秒</item>
+ </string-array>
+
+</resources>
diff --git a/DeviceSettings/res/values-zh-rCN/strings.xml b/DeviceSettings/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..f3971f2
--- /dev/null
+++ b/DeviceSettings/res/values-zh-rCN/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="app_name">Galaxy S II 设置</string>
+
+ <string name="category_screen_title">屏幕</string>
+ <string name="screen_colors_title">颜色</string>
+ <string name="mdnie_scenario_title_head">场景</string>
+ <string name="mdnie_scenario_summary_head">设置 mDNIe 场景</string>
+ <string name="mdnie_mode_title_head">模式</string>
+ <string name="mdnie_mode_summary_head">设置 mDNIe 模式</string>
+ <string name="mdnie_negative_title_head">负极模式</string>
+ <string name="mdnie_negative_summary_head">启用/禁用反色</string>
+ <string name="mdnie_outdoor_title_head">户外模式</string>
+ <string name="mdnie_outdoor_summary_head">启用/禁用户外模式</string>
+ <string name="panel_gamma_title_head">屏幕珈玛</string>
+ <string name="panel_gamma_summary_head">设置屏幕珈玛</string>
+
+ <string name="touchscreen_subcat_title">触摸屏</string>
+ <string name="touchscreen_sensitivity_title_head">触摸屏灵敏度</string>
+ <string name="touchscreen_sensitivity_summary_head">设置触摸屏灵敏度</string>
+
+ <string name="touchkey_subcat_title">触摸键</string>
+ <string name="touchkey_light_title_head">启用触摸键背光灯</string>
+ <string name="touchkey_light_summary_head">屏幕开启时触摸键将会点亮</string>
+ <string name="touchkey_timeout_title_head">背光灯超时</string>
+ <string name="touchkey_timeout_summary_head">设置背光灯超时时间</string>
+
+ <string name="category_sensors_title">感应器</string>
+ <string name="accelerometer_subcat_title">加速规</string>
+ <string name="use_accelerometer_calibration_title_head">使用校准数据</string>
+ <string name="use_accelerometer_calibration_summary_head">使用加速规的校准数据. 请在检查此之后重新校准!</string>
+ <string name="calibrate_accelerometer_title_head">校准</string>
+ <string name="calibrate_accelerometer_summary_head">把手机放在平面上,然后点击此按键进行校准</string>
+ <string name="accelerometer_dialog_head">校准完成</string>
+ <string name="accelerometer_dialog_message">感应器已被成功的校准.</string>
+
+ <string name="category_haptic_title">振动</string>
+ <string name="vibrator_subcat_title">振动器</string>
+ <string name="vibrator_intensity_title_head">振动器强度</string>
+ <string name="vibrator_intensity_summary_head">设置振动器强度</string>
+
+ <string name="category_radio_title">无线电</string>
+ <string name="hspa_title_head">HSPA</string>
+ <string name="hspa_summary_head">启用 HSDPA/HSUPA</string>
+
+ <string name="category_dock_title">基座</string>
+ <string name="dockaudio_subcat_title">音频</string>
+ <string name="use_dock_audio_title_head">使用基座的 USB 音频</string>
+ <string name="use_dock_audio_summary_head">使用基座上的被动音频输出</string>
+</resources>
diff --git a/cm.dependencies b/cm.dependencies
index f834d9d..a8be07c 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"
}
]
diff --git a/proprietary-common-files.txt b/proprietary-common-files.txt
index b672a11..f4b5fec 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 4d6ea7a..650ffa8 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