summaryrefslogtreecommitdiffstats
path: root/res/layout-land
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2010-01-08 15:07:00 -0800
committerRomain Guy <romainguy@android.com>2010-01-08 15:11:52 -0800
commit8f19cdd62f6e2be05e3890916eabd11317ae1bc2 (patch)
treec46060e1f7e6cefeff2ef05df3a2d83819edb37a /res/layout-land
parent677298ac895933c4276a84466684418fa3bec2ba (diff)
downloadandroid_packages_apps_Trebuchet-8f19cdd62f6e2be05e3890916eabd11317ae1bc2.tar.gz
android_packages_apps_Trebuchet-8f19cdd62f6e2be05e3890916eabd11317ae1bc2.tar.bz2
android_packages_apps_Trebuchet-8f19cdd62f6e2be05e3890916eabd11317ae1bc2.zip
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
Diffstat (limited to 'res/layout-land')
-rw-r--r--res/layout-land/application_boxed.xml2
-rw-r--r--res/layout-land/launcher.xml16
-rw-r--r--res/layout-land/live_folder_grid.xml4
-rw-r--r--res/layout-land/user_folder.xml4
-rw-r--r--res/layout-land/workspace_screen.xml4
5 files changed, 15 insertions, 15 deletions
diff --git a/res/layout-land/application_boxed.xml b/res/layout-land/application_boxed.xml
index 7656b58db..dc62361fe 100644
--- a/res/layout-land/application_boxed.xml
+++ b/res/layout-land/application_boxed.xml
@@ -16,7 +16,7 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/name"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="88dip"
android:paddingLeft="2dip"
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index d2009b860..da944b73f 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -19,13 +19,13 @@
xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2"
android:id="@+id/drag_layer"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<com.android.launcher2.AllAppsView
android:id="@+id/all_apps_view"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:scrollbarStyle="outsideInset"
android:drawSelectorOnTop="false"
@@ -37,8 +37,8 @@
<!-- The workspace contains 3 screens of cells -->
<com.android.launcher2.Workspace
android:id="@+id/workspace"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:scrollbars="horizontal"
android:fadeScrollbars="true"
launcher:defaultScreen="2">
@@ -82,7 +82,7 @@
<com.android.launcher2.HandleView
android:id="@+id/all_apps_button"
android:layout_width="@dimen/button_bar_height"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_gravity="right|center_vertical"
android:focusable="true"
@@ -96,7 +96,7 @@
<com.android.launcher2.DeleteZone
android:id="@+id/delete_zone"
android:layout_width="49dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:scaleType="center"
android:src="@drawable/delete_zone_selector"
diff --git a/res/layout-land/live_folder_grid.xml b/res/layout-land/live_folder_grid.xml
index 572c29546..44519d484 100644
--- a/res/layout-land/live_folder_grid.xml
+++ b/res/layout-land/live_folder_grid.xml
@@ -27,12 +27,12 @@
android:textSize="14sp"
android:textColor="#404040"
android:textStyle="bold"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<GridView
android:id="@+id/folder_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
diff --git a/res/layout-land/user_folder.xml b/res/layout-land/user_folder.xml
index 645c02f74..b05974ae7 100644
--- a/res/layout-land/user_folder.xml
+++ b/res/layout-land/user_folder.xml
@@ -24,12 +24,12 @@
android:textSize="14sp"
android:textColor="#404040"
android:textStyle="bold"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<GridView
android:id="@id/folder_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
diff --git a/res/layout-land/workspace_screen.xml b/res/layout-land/workspace_screen.xml
index 531bac242..299478e5c 100644
--- a/res/layout-land/workspace_screen.xml
+++ b/res/layout-land/workspace_screen.xml
@@ -18,8 +18,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
launcher:cellWidth="@dimen/workspace_cell_width"
launcher:cellHeight="@dimen/workspace_cell_height"