summaryrefslogtreecommitdiffstats
path: root/samples/BluetoothChat
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2010-01-08 15:05:33 -0800
committerRomain Guy <romainguy@android.com>2010-01-08 15:11:18 -0800
commit74192eafec8408417114d77784cd35eda5df573c (patch)
treefac15940efc0fdc38b8bdc44d4c3dc6efa474aab /samples/BluetoothChat
parentb4e39aebf6b27aa0ed094a75bde8b2bacda28d98 (diff)
downloadandroid_development-74192eafec8408417114d77784cd35eda5df573c.tar.gz
android_development-74192eafec8408417114d77784cd35eda5df573c.tar.bz2
android_development-74192eafec8408417114d77784cd35eda5df573c.zip
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
Diffstat (limited to 'samples/BluetoothChat')
-rw-r--r--samples/BluetoothChat/res/layout/custom_title.xml8
-rw-r--r--samples/BluetoothChat/res/layout/device_list.xml14
-rw-r--r--samples/BluetoothChat/res/layout/device_name.xml2
-rw-r--r--samples/BluetoothChat/res/layout/main.xml10
-rw-r--r--samples/BluetoothChat/res/layout/message.xml2
5 files changed, 18 insertions, 18 deletions
diff --git a/samples/BluetoothChat/res/layout/custom_title.xml b/samples/BluetoothChat/res/layout/custom_title.xml
index 6b7dca54a..57eb6b4ae 100644
--- a/samples/BluetoothChat/res/layout/custom_title.xml
+++ b/samples/BluetoothChat/res/layout/custom_title.xml
@@ -14,8 +14,8 @@
limitations under the License.
-->
<RelativeLayout 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:gravity="center_vertical"
>
<TextView android:id="@+id/title_left_text"
@@ -24,7 +24,7 @@
android:singleLine="true"
style="?android:attr/windowTitleStyle"
android:layout_width="wrap_content"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_weight="1"
/>
<TextView android:id="@+id/title_right_text"
@@ -32,7 +32,7 @@
android:ellipsize="end"
android:singleLine="true"
android:layout_width="wrap_content"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:textColor="#fff"
android:layout_weight="1"
/>
diff --git a/samples/BluetoothChat/res/layout/device_list.xml b/samples/BluetoothChat/res/layout/device_list.xml
index e7b84b935..395695f82 100644
--- a/samples/BluetoothChat/res/layout/device_list.xml
+++ b/samples/BluetoothChat/res/layout/device_list.xml
@@ -15,11 +15,11 @@
-->
<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:id="@+id/title_paired_devices"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/title_paired_devices"
android:visibility="gone"
@@ -28,13 +28,13 @@
android:paddingLeft="5dp"
/>
<ListView android:id="@+id/paired_devices"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:stackFromBottom="true"
android:layout_weight="1"
/>
<TextView android:id="@+id/title_new_devices"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/title_other_devices"
android:visibility="gone"
@@ -43,13 +43,13 @@
android:paddingLeft="5dp"
/>
<ListView android:id="@+id/new_devices"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:stackFromBottom="true"
android:layout_weight="2"
/>
<Button android:id="@+id/button_scan"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/button_scan"
/>
diff --git a/samples/BluetoothChat/res/layout/device_name.xml b/samples/BluetoothChat/res/layout/device_name.xml
index c693f3ad3..8fa358c97 100644
--- a/samples/BluetoothChat/res/layout/device_name.xml
+++ b/samples/BluetoothChat/res/layout/device_name.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="18sp"
android:padding="5dp"
diff --git a/samples/BluetoothChat/res/layout/main.xml b/samples/BluetoothChat/res/layout/main.xml
index 307f5a5b4..17025f6bb 100644
--- a/samples/BluetoothChat/res/layout/main.xml
+++ b/samples/BluetoothChat/res/layout/main.xml
@@ -16,19 +16,19 @@
<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"
>
<ListView android:id="@+id/in"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:stackFromBottom="true"
android:transcriptMode="alwaysScroll"
android:layout_weight="1"
/>
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<EditText android:id="@+id/edit_text_out"
diff --git a/samples/BluetoothChat/res/layout/message.xml b/samples/BluetoothChat/res/layout/message.xml
index c693f3ad3..8fa358c97 100644
--- a/samples/BluetoothChat/res/layout/message.xml
+++ b/samples/BluetoothChat/res/layout/message.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="18sp"
android:padding="5dp"