diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-11-04 13:59:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-04 13:59:53 -0700 |
| commit | acec6719208a59ccf32bfd4f46e383c9400945d9 (patch) | |
| tree | 0d71ef92732c8befa4b7ad7cfba210396da61527 /res | |
| parent | 14cee9a9bb10807362595f1d1e486716f997fc00 (diff) | |
| parent | 21b411074e39fd10cbc8dd0220bb159da4af2c76 (diff) | |
| download | android_packages_apps_Trebuchet-acec6719208a59ccf32bfd4f46e383c9400945d9.tar.gz android_packages_apps_Trebuchet-acec6719208a59ccf32bfd4f46e383c9400945d9.tar.bz2 android_packages_apps_Trebuchet-acec6719208a59ccf32bfd4f46e383c9400945d9.zip | |
Merge "Cleaning up overscroll effect in launcher workspace" into ics-mr1
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-port/launcher.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index e9ee5f82d..b8df2ee57 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -64,18 +64,18 @@ android:id="@+id/qsb_bar" layout="@layout/qsb_bar" /> - <include layout="@layout/apps_customize_pane" - android:id="@+id/apps_customize_pane" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="invisible" /> - <include layout="@layout/hotseat" android:id="@+id/hotseat" android:layout_width="match_parent" android:layout_height="@dimen/button_bar_height_plus_padding" android:layout_gravity="bottom" /> + <include layout="@layout/apps_customize_pane" + android:id="@+id/apps_customize_pane" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="invisible" /> + <include layout="@layout/workspace_cling" android:id="@+id/workspace_cling" android:layout_width="match_parent" |