diff options
| author | Romain Guy <romainguy@android.com> | 2010-01-08 15:07:00 -0800 |
|---|---|---|
| committer | Romain Guy <romainguy@android.com> | 2010-01-08 15:11:52 -0800 |
| commit | 8f19cdd62f6e2be05e3890916eabd11317ae1bc2 (patch) | |
| tree | c46060e1f7e6cefeff2ef05df3a2d83819edb37a /res/layout-port | |
| parent | 677298ac895933c4276a84466684418fa3bec2ba (diff) | |
| download | android_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-port')
| -rw-r--r-- | res/layout-port/application_boxed.xml | 2 | ||||
| -rw-r--r-- | res/layout-port/launcher.xml | 12 | ||||
| -rw-r--r-- | res/layout-port/live_folder_grid.xml | 4 | ||||
| -rw-r--r-- | res/layout-port/user_folder.xml | 4 | ||||
| -rw-r--r-- | res/layout-port/workspace_screen.xml | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/res/layout-port/application_boxed.xml b/res/layout-port/application_boxed.xml index a6991d580..5e64cee4f 100644 --- a/res/layout-port/application_boxed.xml +++ b/res/layout-port/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-port/launcher.xml b/res/layout-port/launcher.xml index 001f3e322..f73e91c5d 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/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" @@ -38,8 +38,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" launcher:defaultScreen="2"> <include android:id="@+id/cell1" layout="@layout/workspace_screen" /> diff --git a/res/layout-port/live_folder_grid.xml b/res/layout-port/live_folder_grid.xml index 51e5e47fc..745307f4a 100644 --- a/res/layout-port/live_folder_grid.xml +++ b/res/layout-port/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-port/user_folder.xml b/res/layout-port/user_folder.xml index 6a189dc33..7377cdeb5 100644 --- a/res/layout-port/user_folder.xml +++ b/res/layout-port/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-port/workspace_screen.xml b/res/layout-port/workspace_screen.xml index 531bac242..299478e5c 100644 --- a/res/layout-port/workspace_screen.xml +++ b/res/layout-port/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" |