Merge "legend: enable TI FM radio" into gingerbread
diff --git a/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml b/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml
new file mode 100644
index 0000000..451a620
--- /dev/null
+++ b/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml
@@ -0,0 +1,131 @@
+<?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="48dip"
+ android:orientation="horizontal"
+ android:layout_marginTop="170dip"
+ 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="5dip"
+ android:paddingLeft="10dip"
+ android:paddingRight="10dip"
+ >
+ <ImageButton android:id="@+id/btn_speaker"
+ android:src="@drawable/button_loudspeaker_off"
+ android:background="@null"
+ android:layout_marginLeft="5dip"
+ 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="40dip"
+ >
+ <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="45dip"
+ 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="wrap_content"
+ android:layout_marginLeft="11dip"
+ android:layout_marginRight="6dip"
+ android:layout_marginTop="5dip"
+ />
+
+ <!-- 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="240px"
+ android:layout_height="40px"
+ android:paddingTop="0px"
+ android:paddingBottom="23px"
+ android:paddingLeft="20px"
+ android:paddingRight="20px"
+ android:layout_marginTop="0dip"
+ android:layout_gravity="center_horizontal"
+ />
+
+</LinearLayout>
diff --git a/prebuilt/common/bin/modelid_cfg.sh b/prebuilt/common/bin/modelid_cfg.sh
index b4e9252..8a94592 100644
--- a/prebuilt/common/bin/modelid_cfg.sh
+++ b/prebuilt/common/bin/modelid_cfg.sh
@@ -13,25 +13,7 @@
kineto=/system/app/MS-HTCVISION-KNT20-02.apk
rm_kineto=y
-cat /proc/cmdline|grep -q androidboot.mid=PC1010000
-if [ $? = 0 ];
- then
- rm_kineto=n
-fi
-
-cat /proc/cmdline|grep -q androidboot.mid=PB9910000
-if [ $? = 0 ];
- then
- rm_kineto=n
-fi
-
-cat /proc/cmdline|grep -q androidboot.mid=PD1510000
-if [ $? = 0 ];
- then
- rm_kineto=n
-fi
-
-cat /proc/cmdline|grep -q androidboot.mid=PB6510000
+cat /proc/cmdline|egrep -q '(PC1010000)|(PB9910000)|(PD1510000)|(PB6510000)'
if [ $? = 0 ];
then
rm_kineto=n
@@ -55,11 +37,15 @@
#
# Check for spade; if NAM model update DSP and GPS config
#
+# NAM Models:
+# DHD AT&T MODELID PD9812000
+# DHD TELUS MODELID PD9814000
+#
cat /proc/cmdline | grep -q spade
if [ $? = 0 ];
then
-cat /proc/cmdline | grep -q androidboot.mid=PD9812000
+cat /proc/cmdline | egrep -q '(PD9812000)|(PD9814000)'
if [ $? = 0 ];
then
mv /system/etc/nam/*MCLK.txt /system/etc/soundimage/