aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2010-01-08 15:06:04 -0800
committerRomain Guy <romainguy@android.com>2010-01-08 15:06:04 -0800
commiteb7a82a5827230d4d56a5dd26f0445159d20eb98 (patch)
tree6d569fc0e8ec5e6ce9937adcae2fe1efefa52811
parent814b257647a70667c08aa21d5029d952d9911823 (diff)
downloadquake-eb7a82a5827230d4d56a5dd26f0445159d20eb98.tar.gz
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
-rw-r--r--res/layout/downloader.xml10
-rw-r--r--res/layout/downloader_title.xml8
2 files changed, 9 insertions, 9 deletions
diff --git a/res/layout/downloader.xml b/res/layout/downloader.xml
index 264a15f..968c5f2 100644
--- a/res/layout/downloader.xml
+++ b/res/layout/downloader.xml
@@ -16,12 +16,12 @@
-->
<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">
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/customText"
android:layout_width="0dip"
@@ -31,7 +31,7 @@
android:textAppearance="?android:attr/textAppearanceLarge" />
</LinearLayout>
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:text="@string/download_activity_progress"
android:layout_width="0dip"
@@ -49,7 +49,7 @@
</LinearLayout>
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:text="@string/download_activity_time_remaining"
android:layout_width="0dip"
diff --git a/res/layout/downloader_title.xml b/res/layout/downloader_title.xml
index 1acdbed..eae5d33 100644
--- a/res/layout/downloader_title.xml
+++ b/res/layout/downloader_title.xml
@@ -18,14 +18,14 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/screen"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="?android:attr/windowTitleSize"
android:orientation="horizontal">
<TextView android:id="@+id/title_text"
android:gravity="center_vertical"
android:layout_width="0dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:paddingLeft="5dip"
style="?android:attr/windowTitleStyle"
android:singleLine="true"
@@ -35,13 +35,13 @@
<LinearLayout android:id="@+id/loading_indicator"
android:orientation="horizontal"
android:gravity="center_vertical"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_width="wrap_content">
<TextView android:text="@string/download_activity_title"
android:gravity="center_vertical"
android:layout_width="wrap_content"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:paddingRight="5dip"
style="?android:attr/windowTitleStyle" />