summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Chang (bz) <bizkit.tw@gmail.com>2011-10-21 23:24:59 +0800
committerJoseph Chang (bz) <bizkit.tw@gmail.com>2011-10-21 23:24:59 +0800
commit93fc25f69196ee08fbb467277d83b5b18f9c02df (patch)
tree233b249ad35a6f038e11ed7b0974b4e12083abc0
parentb380f4a15126133c92c6e23c019b957852578003 (diff)
download0xbench-93fc25f69196ee08fbb467277d83b5b18f9c02df.tar.gz
Change match_parent to fill_parent in layout to compile with android-4.
-rw-r--r--res/layout/javascript.xml6
-rw-r--r--res/layout/settings.xml20
2 files changed, 13 insertions, 13 deletions
diff --git a/res/layout/javascript.xml b/res/layout/javascript.xml
index 47085db..322b4a9 100644
--- a/res/layout/javascript.xml
+++ b/res/layout/javascript.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
android:orientation="vertical" >
<WebView android:id="@+id/web"
- android:layout_width="match_parent"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
/>
diff --git a/res/layout/settings.xml b/res/layout/settings.xml
index 3ea1bb5..0aeb2ce 100644
--- a/res/layout/settings.xml
+++ b/res/layout/settings.xml
@@ -18,37 +18,37 @@
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
>
<LinearLayout
android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
android:padding="5dp">
<TextView
- android:layout_width="match_parent"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/settings_path_hint"
/>
<TextView android:id="@+id/path_selection"
- android:layout_width="match_parent"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
/>
<RelativeLayout android:id="@+id/result_path_pane"
- android:layout_width="match_parent"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content">
<RadioGroup android:id="@+id/radio_group_path"
- android:layout_width="match_parent"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RadioButton android:id="@+id/radio_sdcard"
- android:layout_width="match_parent"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
/>
<RadioButton android:id="@+id/radio_custom"
android:text="@string/settings_custom_path"
- android:layout_width="match_parent"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
/>
</RadioGroup>