summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2011-09-12 11:50:17 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-12 11:50:17 -0700
commitac6d5db407496a01dda6df03f1491bfc98040228 (patch)
treecef186902a521403d0d26c77e171214d3a1511eb /res
parentd88a0e64ac80197a73fa48aa16c24245e9314020 (diff)
parent9d14b47b0a5753e2f60cdf0e1e07fbb838b8c132 (diff)
downloadandroid_packages_apps_Trebuchet-ac6d5db407496a01dda6df03f1491bfc98040228.tar.gz
android_packages_apps_Trebuchet-ac6d5db407496a01dda6df03f1491bfc98040228.tar.bz2
android_packages_apps_Trebuchet-ac6d5db407496a01dda6df03f1491bfc98040228.zip
Merge "Fix regression: QSB is not clickable"
Diffstat (limited to 'res')
-rw-r--r--res/layout-port/launcher.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 898e849ea..b45800ef5 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -46,10 +46,6 @@
android:layout_gravity="bottom"
android:layout_marginBottom="@dimen/button_bar_height" />
- <include
- android:id="@+id/qsb_bar"
- layout="@layout/qsb_bar" />
-
<!-- The workspace contains 5 screens of cells -->
<com.android.launcher2.Workspace
android:id="@+id/workspace"
@@ -71,6 +67,10 @@
<include android:id="@+id/cell5" layout="@layout/workspace_screen" />
</com.android.launcher2.Workspace>
+ <include
+ 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"