summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2010-01-08 15:07:11 -0800
committerRomain Guy <romainguy@android.com>2010-01-08 15:12:00 -0800
commit5fc0177665e8b894e2b17db444d8cd149bb434c5 (patch)
treed9c75a415da6ddf3e3b5b990402185fc6230ee12
parentb174940d57852679ee1af471ddcd773913bc9fcc (diff)
downloadandroid_packages_apps_SoundRecorder-5fc0177665e8b894e2b17db444d8cd149bb434c5.tar.gz
android_packages_apps_SoundRecorder-5fc0177665e8b894e2b17db444d8cd149bb434c5.tar.bz2
android_packages_apps_SoundRecorder-5fc0177665e8b894e2b17db444d8cd149bb434c5.zip
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
-rw-r--r--res/layout-land/main.xml34
-rw-r--r--res/layout-port/main.xml36
2 files changed, 35 insertions, 35 deletions
diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
index 9aa88e6..0d65783 100644
--- a/res/layout-land/main.xml
+++ b/res/layout-land/main.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
android:src="@android:drawable/divider_horizontal_dark"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"/>
<RelativeLayout android:id="@+id/timerViewLayout"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="134dip"
android:background="@drawable/gradient_bg">
@@ -71,12 +71,12 @@
<ImageView
android:src="@android:drawable/divider_horizontal_dark"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"/>
<FrameLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
@@ -84,12 +84,12 @@
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true" >
<Button android:id="@+id/acceptButton"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/accept"
android:layout_weight="1"
@@ -97,7 +97,7 @@
android:layout_marginLeft="50dip" />
<Button android:id="@+id/discardButton"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/discard"
android:layout_weight="1"
@@ -107,8 +107,8 @@
</LinearLayout>
<RelativeLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<com.android.soundrecorder.VUMeter android:id="@+id/uvMeter"
android:layout_width="150px"
@@ -120,13 +120,13 @@
<ImageView
android:src="@android:drawable/divider_horizontal_dark"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"/>
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="60dip"
android:background="@android:drawable/title_bar"
android:gravity="center_horizontal"
@@ -137,20 +137,20 @@
android:layout_marginBottom="4dip"
android:orientation="horizontal"
android:layout_width="wrap_content"
- android:layout_height="fill_parent" >
+ android:layout_height="match_parent" >
<ImageButton android:id="@+id/recordButton"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
style="@android:style/MediaButton"
android:src="@drawable/record" />
<ImageButton android:id="@+id/playButton"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
style="@android:style/MediaButton"
android:src="@drawable/play" />
<ImageButton android:id="@+id/stopButton"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
style="@android:style/MediaButton"
android:src="@drawable/stop" />
diff --git a/res/layout-port/main.xml b/res/layout-port/main.xml
index 59672f2..816c0cc 100644
--- a/res/layout-port/main.xml
+++ b/res/layout-port/main.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
android:src="@android:drawable/divider_horizontal_dark"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"/>
<RelativeLayout android:id="@+id/timerViewLayout"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="242dip"
android:background="@drawable/gradient_bg">
@@ -55,7 +55,7 @@
<ProgressBar android:id="@+id/stateProgressBar"
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/timerView"
android:max="100"
@@ -68,12 +68,12 @@
<ImageView
android:src="@android:drawable/divider_horizontal_dark"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"/>
<FrameLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
@@ -81,12 +81,12 @@
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true" >
<Button android:id="@+id/acceptButton"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/accept"
android:layout_weight="1"
@@ -94,7 +94,7 @@
android:layout_marginRight="2dip" />
<Button android:id="@+id/discardButton"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/discard"
android:layout_weight="1"
@@ -104,8 +104,8 @@
</LinearLayout>
<RelativeLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<com.android.soundrecorder.VUMeter android:id="@+id/uvMeter"
android:layout_width="200px"
@@ -117,13 +117,13 @@
<ImageView
android:src="@android:drawable/divider_horizontal_dark"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"/>
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="60dip"
android:background="@android:drawable/title_bar"
android:gravity="center_horizontal"
@@ -134,20 +134,20 @@
android:layout_marginBottom="4dip"
android:orientation="horizontal"
android:layout_width="wrap_content"
- android:layout_height="fill_parent" >
+ android:layout_height="match_parent" >
<ImageButton android:id="@+id/recordButton"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
style="@android:style/MediaButton"
android:src="@drawable/record" />
<ImageButton android:id="@+id/playButton"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
style="@android:style/MediaButton"
android:src="@drawable/play" />
<ImageButton android:id="@+id/stopButton"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
style="@android:style/MediaButton"
android:src="@drawable/stop" />