diff options
| author | Winson Chung <winsonc@google.com> | 2011-07-22 11:16:13 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-07-25 12:06:43 -0700 |
| commit | f5f8cefb215fad98ae6d4487852e8b948aba3619 (patch) | |
| tree | fb3221add7c88e1480e2f9aae0177c2d9137c151 /res/layout-port | |
| parent | f4bb1cdecd3cf866a1d87b7b8560234fa7dd4cc5 (diff) | |
| download | android_packages_apps_Trebuchet-f5f8cefb215fad98ae6d4487852e8b948aba3619.tar.gz android_packages_apps_Trebuchet-f5f8cefb215fad98ae6d4487852e8b948aba3619.tar.bz2 android_packages_apps_Trebuchet-f5f8cefb215fad98ae6d4487852e8b948aba3619.zip | |
Launcher cleanup and fixes.
- Removing unused hotseat assets
- Adding xhdpi assets from designer repo
- Decoupling dock divider and scroll bar to fix landscape divider issue
- Fixing issue where dock portals were being clipped
Change-Id: If3894a9a265e0272111e852857f9cfbf994ec050
Diffstat (limited to 'res/layout-port')
| -rw-r--r-- | res/layout-port/hotseat.xml | 1 | ||||
| -rw-r--r-- | res/layout-port/launcher.xml | 17 |
2 files changed, 9 insertions, 9 deletions
diff --git a/res/layout-port/hotseat.xml b/res/layout-port/hotseat.xml index 88dd73867..a122abbf4 100644 --- a/res/layout-port/hotseat.xml +++ b/res/layout-port/hotseat.xml @@ -23,6 +23,7 @@ android:id="@+id/layout" android:layout_width="match_parent" android:layout_height="match_parent" + android:paddingTop="@dimen/button_bar_height_padding" android:paddingLeft="@dimen/workspace_left_padding" android:paddingRight="@dimen/workspace_right_padding" launcher:cellWidth="@dimen/workspace_cell_width" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index fc39034f5..f7e93f003 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -25,12 +25,12 @@ <!-- Keep these behind the workspace so that they are not visible when we go into AllApps --> <include - android:id="@+id/paged_view_indicator_track" - layout="@layout/scroll_indicator_track" + android:id="@+id/dock_divider" + layout="@layout/dock_divider" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:layout_marginBottom="@dimen/button_bar_height" /> + android:layout_marginBottom="@dimen/button_bar_height" + android:layout_gravity="bottom" /> <include android:id="@+id/paged_view_indicator" layout="@layout/scroll_indicator" @@ -47,7 +47,9 @@ launcher:defaultScreen="2" launcher:cellCountX="4" launcher:cellCountY="4" - launcher:pageSpacing="@dimen/workspace_page_spacing"> + launcher:pageSpacing="@dimen/workspace_page_spacing" + launcher:scrollIndicatorPaddingLeft="@dimen/dock_divider_padding_left" + launcher:scrollIndicatorPaddingRight="@dimen/dock_divider_padding_right"> <include android:id="@+id/cell1" layout="@layout/workspace_screen" /> <include android:id="@+id/cell2" layout="@layout/workspace_screen" /> @@ -71,9 +73,6 @@ <include layout="@layout/hotseat" android:id="@+id/hotseat" android:layout_width="match_parent" - android:layout_height="@dimen/button_bar_height" + android:layout_height="@dimen/button_bar_height_plus_padding" android:layout_gravity="bottom" /> - - - </com.android.launcher2.DragLayer> |