ldpi: Adjust for FM flexible layout
Depends on http://review.cyanogenmod.com/#change,9213 being merged first.
Change-Id: I28eaa2e361a08f8720b04de86663184cea461077
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>
