summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2010-01-08 15:06:41 -0800
committerRomain Guy <romainguy@android.com>2010-01-08 15:11:40 -0800
commitc85d534dc00abb4ed57c264195924b6f01931707 (patch)
treebdcf7a74567b07a433b0e0d6b5f6a2657caa3005 /res/layout
parent1c434055c672b70c5ef384f722e9a7fba9f8e259 (diff)
downloadandroid_packages_apps_Bluetooth-c85d534dc00abb4ed57c264195924b6f01931707.tar.gz
android_packages_apps_Bluetooth-c85d534dc00abb4ed57c264195924b6f01931707.tar.bz2
android_packages_apps_Bluetooth-c85d534dc00abb4ed57c264195924b6f01931707.zip
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/access.xml12
-rw-r--r--res/layout/auth.xml12
-rw-r--r--res/layout/bt_enabling_progress.xml10
-rw-r--r--res/layout/confirm_dialog.xml10
-rw-r--r--res/layout/file_transfer.xml20
-rw-r--r--res/layout/main.xml6
-rw-r--r--res/layout/status_bar_ongoing_event_progress_bar.xml20
-rw-r--r--res/layout/testactivity_main.xml2
8 files changed, 46 insertions, 46 deletions
diff --git a/res/layout/access.xml b/res/layout/access.xml
index 5905b2c75..d9abd53a2 100644
--- a/res/layout/access.xml
+++ b/res/layout/access.xml
@@ -19,17 +19,17 @@
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent">
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<LinearLayout
- android:layout_height="fill_parent"
- android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/message"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
@@ -38,7 +38,7 @@
<CheckBox android:id="@+id/alwaysallowed"
style="?android:attr/textAppearanceMedium"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
android:text="@string/alwaysallowed" />
diff --git a/res/layout/auth.xml b/res/layout/auth.xml
index e5c079a2e..7d1a200e1 100644
--- a/res/layout/auth.xml
+++ b/res/layout/auth.xml
@@ -19,17 +19,17 @@
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent">
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<LinearLayout
- android:layout_height="fill_parent"
- android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/message"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
@@ -38,7 +38,7 @@
<EditText
android:id="@+id/text"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dip"
android:layout_marginLeft="20dip"
diff --git a/res/layout/bt_enabling_progress.xml b/res/layout/bt_enabling_progress.xml
index fa09d4e93..7f2fd72b5 100644
--- a/res/layout/bt_enabling_progress.xml
+++ b/res/layout/bt_enabling_progress.xml
@@ -19,13 +19,13 @@
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent">
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<ProgressBar android:id="@+android:id/progress"
android:layout_width="wrap_content"
@@ -33,7 +33,7 @@
<TextView
android:id="@+id/progress_info"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
diff --git a/res/layout/confirm_dialog.xml b/res/layout/confirm_dialog.xml
index 20c3b277d..bc56e983e 100644
--- a/res/layout/confirm_dialog.xml
+++ b/res/layout/confirm_dialog.xml
@@ -19,17 +19,17 @@
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent">
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<LinearLayout
- android:layout_height="fill_parent"
- android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
diff --git a/res/layout/file_transfer.xml b/res/layout/file_transfer.xml
index 55a75ad4b..4dea02d4d 100644
--- a/res/layout/file_transfer.xml
+++ b/res/layout/file_transfer.xml
@@ -19,17 +19,17 @@
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent">
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<LinearLayout
- android:layout_height="fill_parent"
- android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/line1_view"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
@@ -38,7 +38,7 @@
<TextView
android:id="@+id/line2_view"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
@@ -47,7 +47,7 @@
<TextView
android:id="@+id/line3_view"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
@@ -56,7 +56,7 @@
<TextView
android:id="@+id/line4_view"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
@@ -65,7 +65,7 @@
<TextView
android:id="@+id/line5_view"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginLeft="20dip"
@@ -75,7 +75,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index b8e4b03c1..e09207f05 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/hello"
/>
diff --git a/res/layout/status_bar_ongoing_event_progress_bar.xml b/res/layout/status_bar_ongoing_event_progress_bar.xml
index 6af8792b4..9fe42ca0b 100644
--- a/res/layout/status_bar_ongoing_event_progress_bar.xml
+++ b/res/layout/status_bar_ongoing_event_progress_bar.xml
@@ -1,21 +1,21 @@
<?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"
android:background="@android:drawable/status_bar_item_app_background"
>
<LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="horizontal"
>
<LinearLayout
android:layout_width="40dp"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="8dp"
android:focusable="true"
@@ -39,14 +39,14 @@
</LinearLayout>
<RelativeLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical"
android:focusable="true"
android:clickable="true"
>
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:focusable="true"
@@ -65,7 +65,7 @@
</LinearLayout>
<ProgressBar android:id="@+id/progress_bar"
style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:paddingBottom="8dp"
@@ -75,7 +75,7 @@
</LinearLayout>
<com.android.server.status.AnimatedImageView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@android:drawable/divider_horizontal_bright"
/>
diff --git a/res/layout/testactivity_main.xml b/res/layout/testactivity_main.xml
index bf9fa117a..211d6372a 100644
--- a/res/layout/testactivity_main.xml
+++ b/res/layout/testactivity_main.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout android:orientation="horizontal"
android:layout_width="wrap_content"