summaryrefslogtreecommitdiffstats
path: root/res/layout-land
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2010-01-08 15:07:10 -0800
committerRomain Guy <romainguy@android.com>2010-01-08 15:11:59 -0800
commit33787156266b657996be0bf79f969d08ee70c9ba (patch)
treeb04f9f89ddcd63a9f034f62087ebb33422eaec60 /res/layout-land
parent9bd889d7fbad483471e0a4d26f05d2e68b67a2e4 (diff)
downloadpackages_apps_settings-33787156266b657996be0bf79f969d08ee70c9ba.zip
packages_apps_settings-33787156266b657996be0bf79f969d08ee70c9ba.tar.gz
packages_apps_settings-33787156266b657996be0bf79f969d08ee70c9ba.tar.bz2
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
Diffstat (limited to 'res/layout-land')
-rw-r--r--res/layout-land/choose_lock_pattern.xml12
-rw-r--r--res/layout-land/confirm_lock_pattern.xml14
2 files changed, 13 insertions, 13 deletions
diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index 9d623f6..9af76d1 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -18,28 +18,28 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/topLayout"
android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:background="@color/black">
<!-- left side: instructions and messages -->
<LinearLayout
android:orientation="vertical"
android:layout_width="0dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_weight="1.0"
>
<!-- header message -->
<TextView android:id="@+id/headerText"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="18sp"/>
<!-- footer can show a message, or confirm / restart buttons -->
<RelativeLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1.0">
@@ -81,7 +81,7 @@
<View
android:background="@*android:drawable/code_lock_left"
android:layout_width="2dip"
- android:layout_height="fill_parent" />
+ android:layout_height="match_parent" />
<!-- right side: lock pattern -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="wrap_content"
diff --git a/res/layout-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index 6decb14..2da2b9a 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -18,21 +18,21 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/topLayout"
android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:background="@color/black">
<!-- left side: instructions and messages -->
<LinearLayout
android:orientation="vertical"
android:layout_width="0dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_weight="1.0"
>
<!-- header message -->
<TextView android:id="@+id/headerText"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="18sp"/>
@@ -40,13 +40,13 @@
<!-- fill space between header and button below -->
<View
android:layout_weight="1.0"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
/>
<!-- footer message -->
<TextView android:id="@+id/footerText"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="14sp"/>
@@ -55,7 +55,7 @@
<View
android:background="@*android:drawable/code_lock_left"
android:layout_width="2dip"
- android:layout_height="fill_parent" />
+ android:layout_height="match_parent" />
<!-- right side: lock pattern -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="wrap_content"