Merge "CM: Add p970 device (LGE Optimus Black)" into gingerbread
diff --git a/overlay/jordan/packages/apps/Camera/res/values/config.xml b/overlay/jordan/packages/apps/Camera/res/values/config.xml
index a6efecd..0469b05 100644
--- a/overlay/jordan/packages/apps/Camera/res/values/config.xml
+++ b/overlay/jordan/packages/apps/Camera/res/values/config.xml
@@ -16,12 +16,13 @@
** limitations under the License.
*/
-->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
<resources>
- <!-- Wide media profile available -->
- <bool name="supportsWideProfile">true</bool>
+ <!-- Wide media profile available -->
+ <bool name="supportsWideProfile">true</bool>
+
+ <!-- Autofocus parameters -->
+ <string name="touchFocusParameter">mot-areas-to-focus</string>
+ <bool name="touchFocusNeedsRect">true</bool>
</resources>
diff --git a/overlay/ldpi/packages/apps/FM/res/drawable-mdpi/fmradio_background.jpg b/overlay/ldpi/packages/apps/FM/res/drawable-mdpi/fmradio_background.jpg
deleted file mode 100644
index 5bf2372..0000000
--- a/overlay/ldpi/packages/apps/FM/res/drawable-mdpi/fmradio_background.jpg
+++ /dev/null
Binary files differ
diff --git a/overlay/ldpi/packages/apps/FM/res/layout/fm_top.xml b/overlay/ldpi/packages/apps/FM/res/layout/fm_top.xml
new file mode 100644
index 0000000..08f4207
--- /dev/null
+++ b/overlay/ldpi/packages/apps/FM/res/layout/fm_top.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<View
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="0dp"
+ android:layout_height="0dp" />
diff --git a/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml b/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml
deleted file mode 100644
index cfa3233..0000000
--- a/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/fmradio"
- android:background="@drawable/fmradio_background"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- >
-
- <!-- This LinearLayout contains favorite Station Information display and the function buttons -->
- <LinearLayout android:id="@+id/presets_layout"
- android:background="@drawable/favorite_bg"
- android:layout_width="match_parent"
- android:layout_height="38dip"
- android:orientation="horizontal"
- android:layout_marginTop="212dip"
- android:layout_marginLeft="14px"
- android:layout_marginRight="13px"
- >
- <Button android:id="@+id/presets_button_1"
- style="@style/favoriteButtonStyle"
- />
- <View
- android:background="@drawable/favorite_line"
- android:layout_width="2px"
- android:layout_height="match_parent"
- />
- <Button android:id="@+id/presets_button_2"
- style="@style/favoriteButtonStyle"
- />
- <View
- android:background="@drawable/favorite_line"
- android:layout_width="2px"
- android:layout_height="match_parent"
- />
- <Button android:id="@+id/presets_button_3"
- style="@style/favoriteButtonStyle"
- />
- <View
- android:background="@drawable/favorite_line"
- android:layout_width="2px"
- android:layout_height="match_parent"
- />
- <Button android:id="@+id/presets_button_4"
- style="@style/favoriteButtonStyle"
- />
- <View
- android:background="@drawable/favorite_line"
- android:layout_width="2px"
- android:layout_height="match_parent"
- />
- <Button android:id="@+id/presets_button_5"
- style="@style/favoriteButtonStyle"
- />
-
- </LinearLayout>
-
- <!-- This LinearLayout contains Station Information display and the function buttons -->
- <LinearLayout android:id="@+id/stationinfo_layout"
- android:background="@null"
- android:layout_width="match_parent"
- android:layout_height="48dip"
- android:orientation="horizontal"
- android:layout_marginTop="4dip"
- android:paddingLeft="0dip"
- android:paddingRight="0dip"
- >
- <ImageButton android:id="@+id/btn_seekdown"
- android:src="@drawable/btn_arrow_left"
- android:background="@null"
- android:layout_marginLeft="1dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
- <ImageButton android:id="@+id/btn_speaker"
- android:src="@drawable/button_loudspeaker_off"
- android:background="@null"
- android:layout_marginLeft="0dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
-
- <LinearLayout
- android:background="@drawable/station_freq_bg"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="1dip"
- >
- <TextView android:id="@+id/prog_frequency_tv"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="40dip"
- android:gravity="center"
- android:textColor="#FFC3E7AA"
- android:textSize="30sp"
- android:text="@string/frequency_string"
- />
- </LinearLayout>
-
- <ImageButton android:id="@+id/btn_onoff"
- android:src="@drawable/button_power_off"
- android:background="@null"
- android:layout_marginLeft="1dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
-
- <ImageButton android:id="@+id/btn_seekup"
- android:src="@drawable/btn_arrow_right"
- android:background="@null"
- android:layout_marginLeft="0dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
-
- </LinearLayout>
-
- <!-- This is frequency indicator: a red needle -->
- <com.android.fm.radio.FreqIndicator
- android:id="@+id/freq_indicator_view"
- android:progressDrawable="@drawable/freq_indicator_seek"
- android:thumb="@drawable/freq_indicator"
- android:thumbOffset="0dip"
- android:layout_width="match_parent"
- android:layout_height="54dip"
- android:layout_marginLeft="11dip"
- android:layout_marginRight="6dip"
- android:layout_marginTop="4dip"
- />
-
- <!-- This is horizontal FM tuner -->
- <com.android.fm.radio.TunerView
- android:id="@+id/fm_tuner_view"
- android:src="@drawable/tuner_view_0"
- android:layout_width="match_parent"
- android:layout_height="30px"
- android:paddingTop="4px"
- android:paddingBottom="10px"
- android:paddingLeft="10px"
- android:paddingRight="10px"
- android:layout_marginTop="4dip"
- android:layout_gravity="center_horizontal"
- />
-
-</LinearLayout>
diff --git a/overlay/ldpi/packages/apps/FM/res/values/styles.xml b/overlay/ldpi/packages/apps/FM/res/values/styles.xml
deleted file mode 100644
index d722efc..0000000
--- a/overlay/ldpi/packages/apps/FM/res/values/styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<resources>
- <style name="FMStationSeekBar">
- <item name="android:indeterminateOnly">false</item>
- <item name="android:progressDrawable">@android:drawable/progress_horizontal</item>
- <item name="android:indeterminateDrawable">@android:drawable/progress_horizontal</item>
- <item name="android:minHeight">20dip</item>
- <item name="android:maxHeight">20dip</item>
- <item name="android:thumbOffset">8px</item>
- <item name="android:focusable">true</item>
- </style>
- <style name="favoriteButtonStyle">
- <item name="android:background">@drawable/favorite_button_bg</item>
- <item name="android:layout_width">0dip</item>
- <item name="android:layout_weight">1</item>
- <item name="android:layout_height">match_parent</item>
- <item name="android:textSize">18sp</item>
- <item name="android:shadowColor">#FFE8E8E8</item>
- <item name="android:shadowDx">0.0</item>
- <item name="android:shadowDy">1.0</item>
- <item name="android:shadowRadius">1.0</item>
- </style>
-
-</resources>
diff --git a/overlay/leo/packages/apps/CMParts/res/values/config.xml b/overlay/leo/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 1f71848..0000000
--- a/overlay/leo/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <!-- Whether or not to display the trackball settings -->
- <bool name="has_trackball">false</bool>
- <bool name="has_rgb_notification_led">false</bool>
-
- <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/olympus/packages/apps/CMParts/res/values/config.xml b/overlay/olympus/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index f49f9fc..0000000
--- a/overlay/olympus/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <!-- Whether or not to display the trackball settings -->
- <bool name="has_trackball">false</bool>
- <bool name="has_rgb_notification_led">true</bool>
- <bool name="has_camera_button">false</bool>
- <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/tablet/frameworks/base/core/res/res/values-ru/strings.xml b/overlay/tablet/frameworks/base/core/res/res/values-ru/strings.xml
index d6c047a..61a9d3b 100644
--- a/overlay/tablet/frameworks/base/core/res/res/values-ru/strings.xml
+++ b/overlay/tablet/frameworks/base/core/res/res/values-ru/strings.xml
@@ -22,17 +22,17 @@
<string name="lockscreen_carrier_default"></string>
<!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
- <string name="power_dialog">Параметры планшета</string>
+ <string name="power_dialog">Параметры планшетного ПК</string>
<!-- Button to reboot the phone, within the Phone Options dialog -->
<string name="reboot_system">Перезагрузить</string>
<!-- Shutdown Confirmation Dialog. When the user chooses to power off the phone, there will be a confirmation dialog. This is the message. -->
- <string name="shutdown_confirm">Планшет будет выключен.</string>
+ <string name="shutdown_confirm">Планшетный ПК будет выключен.</string>
<!-- Reboot Confirmation Dialog. When the user chooses to reboot the phone, there will be a confirmation dialog. This is the message. -->
- <string name="reboot_confirm">Планшет будет перезагружен.</string>
+ <string name="reboot_confirm">Планшетный ПК будет перезагружен.</string>
<!-- Title of the Global Actions Dialog -->
- <string name="global_actions">Параметры планшета</string>
+ <string name="global_actions">Параметры планшетного ПК</string>
</resources>
diff --git a/overlay/tablet/packages/apps/Settings/res/values-ru/strings.xml b/overlay/tablet/packages/apps/Settings/res/values-ru/strings.xml
index 9e92bb3..c5ded5d 100644
--- a/overlay/tablet/packages/apps/Settings/res/values-ru/strings.xml
+++ b/overlay/tablet/packages/apps/Settings/res/values-ru/strings.xml
@@ -17,7 +17,7 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Main settings screen, setting title for the user to go into the About phone screen -->
- <string name="about_settings">О планшете</string>
+ <string name="about_settings">О планшетном ПК</string>
</resources>
diff --git a/prebuilt/common/etc/spn-conf.xml b/prebuilt/common/etc/spn-conf.xml
index 633a1a2..32b6f1a 100644
--- a/prebuilt/common/etc/spn-conf.xml
+++ b/prebuilt/common/etc/spn-conf.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<spnOverrides>
+ <!-- Japan -->
+ <spnOverride numeric="44020" spn="SoftBank"/>
<!-- Hong Kong -->
+ <spnOverride numeric="45406" spn="SmarTone" />
<spnOverride numeric="45412" spn="中國移動" />
<!-- China -->
<spnOverride numeric="46000" spn="中国移动" />
diff --git a/prebuilt/leo/etc/init.d/01modules b/prebuilt/leo/etc/init.d/01modules
deleted file mode 100755
index 77c2bec..0000000
--- a/prebuilt/leo/etc/init.d/01modules
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/system/bin/sh
-#
-# Load MODULES
-sleep 1
-insmod /system/lib/modules/msm_rmnet.ko
-insmod /system/lib/modules/tun.ko
-insmod /system/lib/modules/cifs.ko
-insmod /system/lib/modules/nls_utf8.ko
-insmod /system/lib/modules/fuse.ko
-echo "+++ RMNET / TUN / CIFS activated +++";
diff --git a/products/cyanogen_hallon.mk b/products/cyanogen_hallon.mk
index e769b84..27e805f 100644
--- a/products/cyanogen_hallon.mk
+++ b/products/cyanogen_hallon.mk
@@ -15,7 +15,7 @@
PRODUCT_DEVICE := hallon
PRODUCT_MODEL := MT15i
PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=MT15i BUILD_ID=4.0.1.A.0.283 BUILD_FINGERPRINT=SEMC/MT15i_1247-0875/MT15i:2.3.4/4.0.1.A.0.283/bn_P:user/release-keys PRIVATE_BUILD_DESC="MT15i-user 2.3.4 4.0.1.A.0.283 bn_P test-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=MT15i BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/MT15i_1247-0875/MT15i:2.3.4/4.0.2.A.0.42/bn_P:user/release-keys PRIVATE_BUILD_DESC="MT15i-user 2.3.4 4.0.2.A.0.42 bn_P test-keys"
# Build kernel
#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
diff --git a/products/cyanogen_leo.mk b/products/cyanogen_leo.mk
index 726f693..8d80f50 100644
--- a/products/cyanogen_leo.mk
+++ b/products/cyanogen_leo.mk
@@ -21,10 +21,6 @@
# Extra leo overlay
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/leo
-# This file is used to install the enable RMNET and corresponding modules which dont get activated by normal module script
-PRODUCT_COPY_FILES += \
- vendor/cyanogen/prebuilt/leo/etc/init.d/01modules:system/etc/init.d/01modules \
-
# Extra RIL settings
PRODUCT_PROPERTY_OVERRIDES += \
ro.ril.enable.managed.roaming=1 \
diff --git a/products/cyanogen_mango.mk b/products/cyanogen_mango.mk
index 77a1533..6fce3ea 100644
--- a/products/cyanogen_mango.mk
+++ b/products/cyanogen_mango.mk
@@ -15,7 +15,7 @@
PRODUCT_DEVICE := mango
PRODUCT_MODEL := SK17i
PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SK17i BUILD_ID=4.0.A.2.368 BUILD_FINGERPRINT=SEMC/SK17i_1249-8062/SK17i:2.3.3/4.0.A.2.368/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="SK17i-user 2.3.3 4.0.A.2.368 j_b_3w test-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SK17i BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/SK17i_1249-8062/SK17i:2.3.4/4.0.2.A.0.42/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="SK17i-user 2.3.4 4.0.2.A.0.42 j_b_3w test-keys"
# Build kernel
#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
