summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout-land/launcher.xml7
-rw-r--r--res/layout-port/launcher.xml5
-rw-r--r--res/layout-sw720dp/launcher.xml5
-rw-r--r--res/layout/qsb_container.xml2
-rw-r--r--res/values/config.xml3
5 files changed, 21 insertions, 1 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 27ff789b5..632aff04b 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -60,6 +60,12 @@
android:layout_height="@dimen/dynamic_grid_page_indicator_height"
android:layout_gravity="bottom|left"/>
+ <!-- A place holder view instead of the QSB in transposed layout -->
+ <View
+ android:layout_width="0dp"
+ android:layout_height="10dp"
+ android:id="@+id/workspace_blocked_row" />
+
<include layout="@layout/widgets_view"
android:id="@+id/widgets_view"
android:layout_width="match_parent"
@@ -71,6 +77,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="invisible" />
+
</com.android.launcher3.dragndrop.DragLayer>
</com.android.launcher3.LauncherRootView>
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 6b5bf6307..0321631ca 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -37,6 +37,7 @@
android:id="@+id/workspace"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_gravity="center"
launcher:pageIndicator="@+id/page_indicator">
</com.android.launcher3.Workspace>
@@ -61,6 +62,10 @@
android:id="@+id/drop_target_bar"
layout="@layout/drop_target_bar_horz" />
+ <include
+ layout="@layout/qsb_container"
+ android:id="@+id/qsb_container" />
+
<include layout="@layout/widgets_view"
android:id="@+id/widgets_view"
android:layout_width="match_parent"
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 33ad32324..86544d3b2 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -33,6 +33,7 @@
<!-- The workspace contains 5 screens of cells -->
<!-- DO NOT CHANGE THE ID -->
<com.android.launcher3.Workspace
+ android:layout_gravity="center"
android:id="@+id/workspace"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -60,6 +61,10 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dynamic_grid_page_indicator_height" />
+ <include
+ layout="@layout/qsb_container"
+ android:id="@+id/qsb_container" />
+
<include layout="@layout/widgets_view"
android:id="@+id/widgets_view"
android:layout_width="match_parent"
diff --git a/res/layout/qsb_container.xml b/res/layout/qsb_container.xml
index 55c7390d3..b75e3b541 100644
--- a/res/layout/qsb_container.xml
+++ b/res/layout/qsb_container.xml
@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="0dp"
android:id="@+id/qsb_container"
android:padding="0dp" >
diff --git a/res/values/config.xml b/res/values/config.xml
index f69fb2ea5..0bb379907 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -74,6 +74,9 @@
<!-- View ID to use for QSB widget -->
<item type="id" name="qsb_widget" />
+ <!-- View ID to use for blocked area on the first screen -->
+ <item type="id" name="workspace_blocked_row" />
+
<!-- View ID used by cell layout to jail its content -->
<item type="id" name="cell_layout_jail_id" />