FM: Change navigation layout's width, height
No option to quit FM app as the width, height
of layout displaying favourite list are not properly
set and hence the layout containing on/off button
disappears
Change-Id: I1ccea26105c9a99467c3f0c98e0816f855ce6d05
CRs-Fixed: 493202
diff --git a/fmapp/res/layout-land-finger-800x480/fmradio.xml b/fmapp/res/layout-normal-land-finger/fmradio.xml
similarity index 70%
rename from fmapp/res/layout-land-finger-800x480/fmradio.xml
rename to fmapp/res/layout-normal-land-finger/fmradio.xml
index f2289fd..939dcc5 100644
--- a/fmapp/res/layout-land-finger-800x480/fmradio.xml
+++ b/fmapp/res/layout-normal-land-finger/fmradio.xml
@@ -26,28 +26,35 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ android:orientation="horizontal"
+ android:layout_height="fill_parent">
<!-- This LinearLayout contains Station Information display and the function buttons -->
- <RelativeLayout android:id="@+id/station_info_wrapper_layout"
+ <LinearLayout android:id="@+id/station_info_wrapper_layout"
android:background="@drawable/station_border"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ android:orientation="vertical"
+ android:layout_weight="0.6"
+ android:layout_width="0dp"
+ android:layout_height="fill_parent">
<include layout="@layout/station_info" />
- </RelativeLayout>
+ </LinearLayout>
- <RelativeLayout android:id="@+id/navigate_wrapper_layout"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/station_info_wrapper_layout">
+ <LinearLayout android:id="@+id/navigate_wrapper_layout"
+ android:layout_height="fill_parent"
+ android:layout_weight="0.4"
+ android:layout_width="0dp"
+ android:orientation="vertical"
+ android:layout_alignTop="@id/station_info_wrapper_layout"
+ android:layout_alignBottom="@id/station_info_wrapper_layout"
+ android:layout_toRightOf="@id/station_info_wrapper_layout">
<!-- Layout contains the Next/Previous Presets and Tune buttons and status msg text-->
<include layout="@layout/navigate"/>
- </RelativeLayout>
+ </LinearLayout>
-</RelativeLayout>
+</LinearLayout>
diff --git a/fmapp/res/layout-land-finger-800x480/fmtransmitter.xml b/fmapp/res/layout-normal-land-finger/fmtransmitter.xml
similarity index 100%
rename from fmapp/res/layout-land-finger-800x480/fmtransmitter.xml
rename to fmapp/res/layout-normal-land-finger/fmtransmitter.xml
diff --git a/fmapp/res/layout-land-finger-800x480/navigate.xml b/fmapp/res/layout-normal-land-finger/navigate.xml
similarity index 75%
rename from fmapp/res/layout-land-finger-800x480/navigate.xml
rename to fmapp/res/layout-normal-land-finger/navigate.xml
index fab276a..ddc650b 100644
--- a/fmapp/res/layout-land-finger-800x480/navigate.xml
+++ b/fmapp/res/layout-normal-land-finger/navigate.xml
@@ -37,37 +37,25 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:textSize="16dip"
+ android:textSize="16dp"
android:textStyle="bold"
android:text="@string/default_record"/>
- <ImageButton android:id="@+id/btn_silent"
- android:src="@drawable/ic_silent_mode_off"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_toLeftOf="@id/btn_presets_list"/>
-
<Button android:id="@+id/btn_presets_list"
android:text= "@string/default_preset_list_name"
- android:textSize="24dip"
+ android:textSize="24dp"
android:singleLine="true"
android:textStyle="bold"
android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
- <ImageButton android:id="@+id/btn_onoff"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_toRightOf="@id/btn_presets_list"
- android:src="@drawable/ic_btn_onoff"/>
-
<TextView android:id="@+id/sleep_msg_tv"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
- android:textSize="16dip"
+ android:textSize="16dp"
android:textStyle="bold"
androidtext="@string/default_sleep"/>
@@ -77,76 +65,97 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/message_row"
- android:layout_marginTop="1dip"
- android:layout_marginBottom="5dip">
+ android:layout_marginTop="1dp"
+ android:layout_marginBottom="5dp">
<RelativeLayout android:id="@+id/presets_upper_layout1"
android:layout_width="wrap_content"
- android:layout_centerInParent="true"
android:layout_height="wrap_content">
<Button android:id="@+id/presets_button_1"
android:text="@string/default_station"
- android:layout_marginLeft="10dip"
- android:layout_marginRight="25dip"
- android:textSize="24dip"
+ android:textSize="24dp"
+ android:layout_marginRight="10dp"
android:singleLine="true"
- android:layout_width="wrap_content"
+ android:layout_width="75dp"
android:layout_height="wrap_content" />
<Button android:id="@+id/presets_button_2"
android:text="@string/default_station"
- android:layout_marginRight="25dip"
- android:textSize="24dip"
+ android:layout_marginRight="10dp"
+ android:textSize="24dp"
android:singleLine="true"
android:layout_alignTop="@id/presets_button_1"
android:layout_alignBottom="@id/presets_button_1"
android:layout_toRightOf="@id/presets_button_1"
- android:layout_width="wrap_content"
+ android:layout_width="75dp"
android:layout_height="wrap_content" />
<Button android:id="@+id/presets_button_3"
android:text="@string/default_station"
- android:layout_marginRight="25dip"
- android:textSize="24dip"
+ android:textSize="24dp"
android:singleLine="true"
android:layout_alignTop="@id/presets_button_2"
android:layout_alignBottom="@id/presets_button_2"
android:layout_toRightOf="@id/presets_button_2"
- android:layout_width="wrap_content"
+ android:layout_width="75dp"
android:layout_height="wrap_content" />
+ </RelativeLayout>
+
+ <RelativeLayout android:id="@+id/presets_upper_layout2"
+ android:layout_width="wrap_content"
+ android:layout_below="@id/presets_upper_layout1"
+ android:layout_height="wrap_content">
+
<Button android:id="@+id/presets_button_4"
android:text="@string/default_blank"
- android:layout_marginRight="25dip"
- android:textSize="24dip"
+ android:layout_marginRight="10dp"
+ android:textSize="24dp"
android:singleLine="true"
- android:layout_alignTop="@id/presets_button_3"
- android:layout_alignBottom="@id/presets_button_3"
- android:layout_toRightOf="@id/presets_button_3"
- android:layout_width="wrap_content"
+ android:layout_width="75dp"
android:layout_height="wrap_content"/>
<Button android:id="@+id/presets_button_5"
android:text="@string/default_blank"
- android:layout_marginRight="25dip"
- android:textSize="24dip"
+ android:layout_marginRight="10dp"
+ android:textSize="24dp"
android:singleLine="true"
android:layout_alignTop="@id/presets_button_4"
android:layout_alignBottom="@id/presets_button_4"
android:layout_toRightOf="@id/presets_button_4"
- android:layout_width="wrap_content"
+ android:layout_width="75dp"
android:layout_height="wrap_content" />
<ImageButton android:id="@+id/btn_preset_page"
android:src="@drawable/ic_btn_forward"
- android:layout_marginRight="10dip"
android:layout_alignTop="@id/presets_button_5"
android:layout_alignBottom="@id/presets_button_5"
android:layout_toRightOf="@id/presets_button_5"
- android:layout_width="wrap_content"
+ android:layout_width="75dp"
android:layout_height="wrap_content"/>
</RelativeLayout>
+
+ <RelativeLayout android:id="@+id/silent_on_off_layout"
+ android:layout_width="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_below="@id/presets_upper_layout2"
+ android:layout_height="wrap_content">
+
+ <ImageButton android:id="@+id/btn_silent"
+ android:src="@drawable/ic_silent_mode_off"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+ <ImageButton android:id="@+id/btn_onoff"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toRightOf="@id/btn_silent"
+ android:src="@drawable/ic_btn_onoff"/>
+
+ </RelativeLayout>
+
</RelativeLayout>
+
</merge>
diff --git a/fmapp/res/layout-land-finger-800x480/station_info.xml b/fmapp/res/layout-normal-land-finger/station_info.xml
similarity index 100%
rename from fmapp/res/layout-land-finger-800x480/station_info.xml
rename to fmapp/res/layout-normal-land-finger/station_info.xml
diff --git a/fmapp/res/layout-800x480/fmradio.xml b/fmapp/res/layout-normal/fmradio.xml
similarity index 97%
rename from fmapp/res/layout-800x480/fmradio.xml
rename to fmapp/res/layout-normal/fmradio.xml
index b3dbccb..5b9197c 100644
--- a/fmapp/res/layout-800x480/fmradio.xml
+++ b/fmapp/res/layout-normal/fmradio.xml
@@ -30,7 +30,7 @@
android:id="@+id/fmradio"
android:background="@drawable/application_border"
android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_height="wrap_content">
<!-- This LinearLayout contains Station Information display and the function buttons -->
@@ -72,7 +72,7 @@
<RelativeLayout android:id="@+id/layout_on_off"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
+ android:layout_marginTop="1dp"
android:layout_centerInParent="true"
android:layout_below="@id/on_off_separator_layout">
diff --git a/fmapp/res/layout-800x480/fmtags.xml b/fmapp/res/layout-normal/fmtags.xml
similarity index 100%
rename from fmapp/res/layout-800x480/fmtags.xml
rename to fmapp/res/layout-normal/fmtags.xml
diff --git a/fmapp/res/layout-800x480/fmtransmitter.xml b/fmapp/res/layout-normal/fmtransmitter.xml
similarity index 100%
rename from fmapp/res/layout-800x480/fmtransmitter.xml
rename to fmapp/res/layout-normal/fmtransmitter.xml
diff --git a/fmapp/res/layout-800x480/navigate.xml b/fmapp/res/layout-normal/navigate.xml
similarity index 90%
rename from fmapp/res/layout-800x480/navigate.xml
rename to fmapp/res/layout-normal/navigate.xml
index 7e60d32..bd8cdea 100644
--- a/fmapp/res/layout-800x480/navigate.xml
+++ b/fmapp/res/layout-normal/navigate.xml
@@ -31,9 +31,9 @@
<RelativeLayout android:id="@+id/message_row"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:paddingTop="5dp"
- android:paddingBottom="5dp">
+ android:layout_marginTop="1dp"
+ android:paddingTop="1dp"
+ android:paddingBottom="1dp">
<TextView android:id="@+id/record_msg_tv"
android:textAppearance="?android:attr/textAppearanceMedium"
@@ -41,7 +41,7 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
- android:textSize="28dp"
+ android:textSize="15dp"
android:textStyle="bold"
android:gravity="fill"
android:text="@string/default_record" />
@@ -69,7 +69,7 @@
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_alignBaseline="@+id/btn_presets_list"
- android:textSize="28dp"
+ android:textSize="15dp"
android:textStyle="bold"
android:gravity="fill"
android:text="@string/default_sleep" />
@@ -93,8 +93,8 @@
android:textSize="24dp"
android:singleLine="true"
android:gravity="fill"
- android:layout_width="120dp"
- android:layout_height="65dp" />
+ android:layout_width="85dp"
+ android:layout_height="wrap_content" />
<Button android:id="@+id/presets_button_2"
android:text="@string/default_blank"
@@ -105,8 +105,8 @@
android:layout_alignTop="@id/presets_button_1"
android:layout_alignBottom="@id/presets_button_1"
android:gravity="fill"
- android:layout_width="120dp"
- android:layout_height="65dp" />
+ android:layout_width="85dp"
+ android:layout_height="wrap_content" />
<Button android:id="@+id/presets_button_3"
android:text="@string/default_blank"
@@ -116,9 +116,9 @@
android:layout_toRightOf="@id/presets_button_2"
android:layout_alignTop="@id/presets_button_2"
android:layout_alignBottom="@id/presets_button_2"
- android:layout_width="120dp"
+ android:layout_width="85dp"
android:gravity="fill"
- android:layout_height="65dp" />
+ android:layout_height="wrap_content" />
</RelativeLayout>
<!-- Lower Presets -->
@@ -134,11 +134,11 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="24dp"
android:singleLine="true"
- android:layout_width="120dp"
+ android:layout_width="85dp"
android:gravity="fill"
android:layout_alignLeft="@id/presets_button_1"
android:layout_alignRight="@id/presets_button_1"
- android:layout_height="65dp" />
+ android:layout_height="wrap_content" />
<Button android:id="@+id/presets_button_5"
android:text="@string/default_blank"
@@ -151,8 +151,8 @@
android:layout_alignLeft="@id/presets_button_2"
android:layout_alignRight="@id/presets_button_2"
android:gravity="fill"
- android:layout_width="120dp"
- android:layout_height="65dp" />
+ android:layout_width="85dp"
+ android:layout_height="wrap_content" />
<ImageButton android:id="@+id/btn_preset_page"
android:src="@drawable/ic_btn_forward"
@@ -162,8 +162,8 @@
android:layout_alignLeft="@id/presets_button_3"
android:layout_alignRight="@id/presets_button_3"
android:gravity="fill"
- android:layout_width="120dp"
- android:layout_height="65dp" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
</RelativeLayout>
</RelativeLayout>
@@ -177,9 +177,9 @@
android:clickable="true"
android:text="@string/stop_scanning"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="32dip"
+ android:textSize="32dp"
android:singleLine="true"
- android:padding="20dip"
+ android:padding="20dp"
android:gravity="fill"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
diff --git a/fmapp/res/layout-800x480/station_info.xml b/fmapp/res/layout-normal/station_info.xml
similarity index 90%
rename from fmapp/res/layout-800x480/station_info.xml
rename to fmapp/res/layout-normal/station_info.xml
index 475d42a..e47f823 100644
--- a/fmapp/res/layout-800x480/station_info.xml
+++ b/fmapp/res/layout-normal/station_info.xml
@@ -44,7 +44,7 @@
android:src="@drawable/ic_signal_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingLeft="5dip"
+ android:paddingLeft="5dp"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"/>
@@ -55,7 +55,7 @@
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_alignBaseline="@id/signal_level"
- android:textSize="16dip"
+ android:textSize="16dp"
android:singleLine="true"
android:textStyle="bold"
android:text="@string/prog_service_string" />
@@ -64,11 +64,11 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingRight="5dip"
+ android:paddingRight="5dp"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_alignBaseline="@id/signal_level"
- android:textSize="16dip"
+ android:textSize="16dp"
android:text="@string/default_audio" />
</RelativeLayout>
@@ -82,7 +82,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="16dip"
+ android:textSize="16dp"
android:layout_centerInParent="true"
android:text="@string/station_id_string" />
@@ -98,7 +98,7 @@
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="50dip"
+ android:textSize="50dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="@string/frequency_string"/>
@@ -107,8 +107,8 @@
android:clickable="true"
android:focusable="true"
android:layout_width="wrap_content"
- android:layout_height="100dip"
- android:paddingLeft="2dip"
+ android:layout_height="100dp"
+ android:paddingLeft="2dp"
android:layout_alignParentLeft="true"
android:visibility="visible"
android:layout_alignWithParentIfMissing="true"
@@ -118,8 +118,8 @@
android:clickable="true"
android:focusable="true"
android:layout_width="wrap_content"
- android:layout_height="100dip"
- android:paddingRight="2dip"
+ android:layout_height="100dp"
+ android:paddingRight="2dp"
android:layout_alignParentRight="true"
android:visibility="visible"
android:layout_alignWithParentIfMissing="true"
@@ -137,7 +137,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="16dip"
+ android:textSize="16dp"
android:layout_centerInParent="true"
android:text="@string/pty_string" />
</RelativeLayout>
@@ -154,12 +154,12 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="16dip"
+ android:textSize="16dp"
android:singleLine="true"
android:textStyle="bold"
- android:paddingLeft="2dip"
- android:paddingRight="2dip"
- android:paddingBottom="5dip"
+ android:paddingLeft="2dp"
+ android:paddingRight="2dp"
+ android:paddingBottom="5dp"
android:gravity="center"
android:text="@string/radio_text_string" />
@@ -167,12 +167,12 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="16dip"
+ android:textSize="16dp"
android:singleLine="true"
android:textStyle="bold"
- android:paddingLeft="2dip"
- android:paddingRight="2dip"
- android:paddingBottom="5dip"
+ android:paddingLeft="2dp"
+ android:paddingRight="2dp"
+ android:paddingBottom="5dp"
android:layout_below="@id/radio_text_tv"
android:gravity="center_horizontal"
android:text="@string/eradio_text_string"/>
diff --git a/fmapp/res/layout-land-finger/fmradio.xml b/fmapp/res/layout-small-land-finger/fmradio.xml
similarity index 100%
rename from fmapp/res/layout-land-finger/fmradio.xml
rename to fmapp/res/layout-small-land-finger/fmradio.xml
diff --git a/fmapp/res/layout-land-finger/fmtransmitter.xml b/fmapp/res/layout-small-land-finger/fmtransmitter.xml
similarity index 100%
rename from fmapp/res/layout-land-finger/fmtransmitter.xml
rename to fmapp/res/layout-small-land-finger/fmtransmitter.xml
diff --git a/fmapp/res/layout-land-finger/navigate.xml b/fmapp/res/layout-small-land-finger/navigate.xml
similarity index 100%
rename from fmapp/res/layout-land-finger/navigate.xml
rename to fmapp/res/layout-small-land-finger/navigate.xml
diff --git a/fmapp/res/layout-land-finger/station_info.xml b/fmapp/res/layout-small-land-finger/station_info.xml
similarity index 100%
rename from fmapp/res/layout-land-finger/station_info.xml
rename to fmapp/res/layout-small-land-finger/station_info.xml
diff --git a/fmapp/res/layout/alert_dialog_list.xml b/fmapp/res/layout-small/alert_dialog_list.xml
similarity index 100%
rename from fmapp/res/layout/alert_dialog_list.xml
rename to fmapp/res/layout-small/alert_dialog_list.xml
diff --git a/fmapp/res/layout/alert_dialog_text_entry.xml b/fmapp/res/layout-small/alert_dialog_text_entry.xml
similarity index 100%
rename from fmapp/res/layout/alert_dialog_text_entry.xml
rename to fmapp/res/layout-small/alert_dialog_text_entry.xml
diff --git a/fmapp/res/layout/fmradio.xml b/fmapp/res/layout-small/fmradio.xml
similarity index 87%
rename from fmapp/res/layout/fmradio.xml
rename to fmapp/res/layout-small/fmradio.xml
index e67bde1..e929965 100644
--- a/fmapp/res/layout/fmradio.xml
+++ b/fmapp/res/layout-small/fmradio.xml
@@ -39,7 +39,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginTop="5dip"
+ android:layout_marginTop="5dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true">
@@ -67,8 +67,8 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center"
- android:layout_marginTop="2dip"
- android:layout_marginBottom="2dip"
+ android:layout_marginTop="2dp"
+ android:layout_marginBottom="2dp"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:layout_weight="0"
@@ -76,23 +76,23 @@
<ImageButton android:id="@+id/btn_silent"
android:src="@drawable/ic_silent_mode_off"
- android:layout_marginLeft="10dip"
- android:layout_marginRight="20dip"
- android:layout_width="100dip"
- android:layout_height="50dip"/>
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="20dp"
+ android:layout_width="100dp"
+ android:layout_height="50dp"/>
<ImageButton android:id="@+id/btn_onoff"
android:src="@drawable/ic_btn_onoff"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="10dip"
- android:layout_width="100dip"
- android:layout_height="50dip"/>
+ android:layout_marginLeft="20dp"
+ android:layout_marginRight="10dp"
+ android:layout_width="100dp"
+ android:layout_height="50dp"/>
</LinearLayout>
<View
android:layout_width="fill_parent"
- android:layout_height="1dip"
+ android:layout_height="1dp"
android:background="#ffffffff"
android:layout_above="@+id/layout_on_off"/>
diff --git a/fmapp/res/layout/fmstats.xml b/fmapp/res/layout-small/fmstats.xml
similarity index 100%
rename from fmapp/res/layout/fmstats.xml
rename to fmapp/res/layout-small/fmstats.xml
diff --git a/fmapp/res/layout-800x480/fmtags.xml b/fmapp/res/layout-small/fmtags.xml
similarity index 100%
copy from fmapp/res/layout-800x480/fmtags.xml
copy to fmapp/res/layout-small/fmtags.xml
diff --git a/fmapp/res/layout/fmtransmitter.xml b/fmapp/res/layout-small/fmtransmitter.xml
similarity index 100%
rename from fmapp/res/layout/fmtransmitter.xml
rename to fmapp/res/layout-small/fmtransmitter.xml
diff --git a/fmapp/res/layout/frequency_picker.xml b/fmapp/res/layout-small/frequency_picker.xml
similarity index 100%
rename from fmapp/res/layout/frequency_picker.xml
rename to fmapp/res/layout-small/frequency_picker.xml
diff --git a/fmapp/res/layout/frequency_picker_dialog.xml b/fmapp/res/layout-small/frequency_picker_dialog.xml
similarity index 100%
rename from fmapp/res/layout/frequency_picker_dialog.xml
rename to fmapp/res/layout-small/frequency_picker_dialog.xml
diff --git a/fmapp/res/layout/navigate.xml b/fmapp/res/layout-small/navigate.xml
similarity index 80%
rename from fmapp/res/layout/navigate.xml
rename to fmapp/res/layout-small/navigate.xml
index 30cff7e..8d7a603 100644
--- a/fmapp/res/layout/navigate.xml
+++ b/fmapp/res/layout-small/navigate.xml
@@ -31,7 +31,7 @@
<RelativeLayout android:id="@+id/message_row"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="5dip"
+ android:layout_marginTop="5dp"
android:orientation="horizontal">
<TextView android:id="@+id/record_msg_tv"
@@ -40,7 +40,7 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
- android:textSize="14dip"
+ android:textSize="14dp"
android:textStyle="bold"
android:text="@string/default_record"/>
@@ -51,10 +51,10 @@
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
android:layout_gravity="center"
- android:layout_marginLeft="10dip"
- android:layout_marginRight="10dip"
- android:layout_width="140dip"
- android:layout_height="45dip" />
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_width="140dp"
+ android:layout_height="45dp" />
<TextView android:id="@+id/sleep_msg_tv"
android:textAppearance="?android:attr/textAppearanceMedium"
@@ -63,7 +63,7 @@
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_alignBaseline="@+id/btn_presets_list"
- android:textSize="14dip"
+ android:textSize="14dp"
android:textStyle="bold"
android:text="@string/default_sleep" />
@@ -81,27 +81,27 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center"
- android:layout_marginBottom="5dip"
+ android:layout_marginBottom="5dp"
android:gravity="center_horizontal">
<Button android:id="@+id/presets_button_1"
android:text="@string/default_station"
android:layout_marginLeft="10dip"
- android:layout_width="90dip"
- android:layout_height="55dip" />
+ android:layout_width="90dp"
+ android:layout_height="55dp" />
<Button android:id="@+id/presets_button_2"
android:text="@string/default_station"
- android:layout_marginLeft="10dip"
- android:layout_marginRight="10dip"
- android:layout_width="90dip"
- android:layout_height="55dip" />
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_width="90dp"
+ android:layout_height="55dp" />
<Button android:id="@+id/presets_button_3"
android:text="@string/default_station"
- android:layout_marginRight="10dip"
- android:layout_width="90dip"
- android:layout_height="55dip"
+ android:layout_marginRight="10dp"
+ android:layout_width="90dp"
+ android:layout_height="55dp"
android:visibility="visible" />
</LinearLayout>
@@ -112,27 +112,27 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center"
- android:layout_marginBottom="5dip"
+ android:layout_marginBottom="5dp"
android:gravity="center_horizontal">
<Button android:id="@+id/presets_button_4"
android:text="@string/default_blank"
- android:layout_marginLeft="10dip"
- android:layout_width="90dip"
- android:layout_height="55dip" />
+ android:layout_marginLeft="10dp"
+ android:layout_width="90dp"
+ android:layout_height="55dp" />
<Button android:id="@+id/presets_button_5"
android:text="@string/default_blank"
- android:layout_marginLeft="10dip"
- android:layout_marginRight="10dip"
- android:layout_width="90dip"
- android:layout_height="55dip" />
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_width="90dp"
+ android:layout_height="55dp" />
<ImageButton android:id="@+id/btn_preset_page"
android:src="@drawable/preset_page_button"
- android:layout_marginRight="10dip"
- android:layout_width="90dip"
- android:layout_height="55dip"
+ android:layout_marginRight="10dp"
+ android:layout_width="90dp"
+ android:layout_height="55dp"
android:visibility="visible" />
</LinearLayout>
@@ -149,7 +149,7 @@
android:clickable="true"
android:text="@string/stop_scanning"
android:singleLine="true"
- android:padding="20dip"
+ android:padding="20dp"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
diff --git a/fmapp/res/layout/station_info.xml b/fmapp/res/layout-small/station_info.xml
similarity index 82%
rename from fmapp/res/layout/station_info.xml
rename to fmapp/res/layout-small/station_info.xml
index 876026a..0f3fce4 100644
--- a/fmapp/res/layout/station_info.xml
+++ b/fmapp/res/layout-small/station_info.xml
@@ -43,7 +43,7 @@
android:src="@drawable/ic_signal_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingLeft="5dip"
+ android:paddingLeft="5dp"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"/>
@@ -54,7 +54,7 @@
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_alignBaseline="@id/signal_level"
- android:textSize="20dip"
+ android:textSize="20dp"
android:singleLine="true"
android:textStyle="bold"
android:text="@string/prog_service_string"/>
@@ -63,11 +63,11 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingRight="5dip"
+ android:paddingRight="5dp"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_alignBaseline="@id/signal_level"
- android:textSize="14dip"
+ android:textSize="14dp"
android:text="@string/default_audio"/>
</RelativeLayout>
@@ -76,8 +76,8 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingTop="5dip"
- android:paddingBottom="5dip"
+ android:paddingTop="5dp"
+ android:paddingBottom="5dp"
android:layout_alignWithParentIfMissing="true"
android:gravity="center">
@@ -85,26 +85,26 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="14dip"
- android:paddingTop="2dip"
- android:paddingRight="2dip"
- android:paddingBottom="2dip"
- android:paddingLeft="2dip"
+ android:textSize="14dp"
+ android:paddingTop="2dp"
+ android:paddingRight="2dp"
+ android:paddingBottom="2dp"
+ android:paddingLeft="2dp"
android:text="@string/station_id_string" />
<RelativeLayout android:id="@+id/second_layout"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="2dip"
- android:layout_marginBottom="2dip"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip">
+ android:layout_marginTop="2dp"
+ android:layout_marginBottom="2dp"
+ android:layout_marginLeft="2dp"
+ android:layout_marginRight="2dp">
<TextView android:id="@+id/prog_frequency_tv"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="64dip"
+ android:textSize="64dp"
android:layout_centerHorizontal="true"
android:text="@string/frequency_string"/>
@@ -112,8 +112,8 @@
android:clickable="true"
android:focusable="true"
android:layout_width="wrap_content"
- android:layout_height="100dip"
- android:paddingLeft="2dip"
+ android:layout_height="100dp"
+ android:paddingLeft="2dp"
android:layout_alignParentLeft="true"
android:visibility="visible"
android:layout_alignWithParentIfMissing="true"
@@ -123,8 +123,8 @@
android:clickable="true"
android:focusable="true"
android:layout_width="wrap_content"
- android:layout_height="100dip"
- android:paddingRight="2dip"
+ android:layout_height="100dp"
+ android:paddingRight="2dp"
android:layout_alignParentRight="true"
android:visibility="visible"
android:layout_alignWithParentIfMissing="true"
@@ -136,11 +136,11 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="14dip"
- android:paddingTop="2dip"
- android:paddingRight="2dip"
- android:paddingBottom="2dip"
- android:paddingLeft="2dip"
+ android:textSize="14dp"
+ android:paddingTop="2dp"
+ android:paddingRight="2dp"
+ android:paddingBottom="2dp"
+ android:paddingLeft="2dp"
android:text="@string/pty_string" />
</LinearLayout>
@@ -150,12 +150,12 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="20dip"
+ android:textSize="20dp"
android:singleLine="true"
android:textStyle="bold"
- android:paddingLeft="2dip"
- android:paddingRight="2dip"
- android:paddingBottom="5dip"
+ android:paddingLeft="2dp"
+ android:paddingRight="2dp"
+ android:paddingBottom="5dp"
android:gravity="center_horizontal"
android:text="@string/radio_text_string"/>
@@ -163,12 +163,12 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="20dip"
+ android:textSize="20dp"
android:singleLine="true"
android:textStyle="bold"
- android:paddingLeft="2dip"
- android:paddingRight="2dip"
- android:paddingBottom="5dip"
+ android:paddingLeft="2dp"
+ android:paddingRight="2dp"
+ android:paddingBottom="5dp"
android:gravity="center_horizontal"
android:text="@string/eradio_text_string"/>
</LinearLayout>
diff --git a/fmapp/res/layout/statusbar.xml b/fmapp/res/layout-small/statusbar.xml
similarity index 100%
rename from fmapp/res/layout/statusbar.xml
rename to fmapp/res/layout-small/statusbar.xml
diff --git a/fmapp/res/layout/fmtags.xml b/fmapp/res/layout/fmtags.xml
deleted file mode 100644
index 352320f..0000000
--- a/fmapp/res/layout/fmtags.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2009, 2012, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Linux Foundation nor
- * the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent">
-
- <ListView
- android:id="@+id/TagListView"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:textSize="30sp"/>
-
-</RelativeLayout>