summaryrefslogtreecommitdiffstats
path: root/tests/BatteryWaster
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2010-01-08 15:06:28 -0800
committerRomain Guy <romainguy@android.com>2010-01-08 15:11:38 -0800
commit980a938c1c9a6a5791a8240e5a1e6638ab28dc77 (patch)
tree75a3a1347b5423cc98859d3976076cea3dc22564 /tests/BatteryWaster
parent0a0289420227fee51406cf4cc508f09d8ecdd2f4 (diff)
downloadframeworks_base-980a938c1c9a6a5791a8240e5a1e6638ab28dc77.zip
frameworks_base-980a938c1c9a6a5791a8240e5a1e6638ab28dc77.tar.gz
frameworks_base-980a938c1c9a6a5791a8240e5a1e6638ab28dc77.tar.bz2
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
Diffstat (limited to 'tests/BatteryWaster')
-rw-r--r--tests/BatteryWaster/res/layout/battery_waster.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/BatteryWaster/res/layout/battery_waster.xml b/tests/BatteryWaster/res/layout/battery_waster.xml
index b6eab03..e1cb6bf 100644
--- a/tests/BatteryWaster/res/layout/battery_waster.xml
+++ b/tests/BatteryWaster/res/layout/battery_waster.xml
@@ -15,13 +15,13 @@
-->
<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"
>
<CheckBox android:id="@+id/checkbox"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="25dp"
android:layout_marginTop="25dp"
@@ -31,12 +31,12 @@
/>
<ScrollView android:id="@+id/scroll"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1"
>
<TextView android:id="@+id/log"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:textSize="12sp"