summaryrefslogtreecommitdiffstats
path: root/res/layout-sw720dp/launcher.xml
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2015-07-23 21:24:37 -0700
committerHyunyoung Song <hyunyoungs@google.com>2015-07-23 21:24:37 -0700
commit0c0d54637af7109ae22e21a117dba3efdaded4b5 (patch)
treefe9ed94353b09dda232fceb64691f96dcd5db8d3 /res/layout-sw720dp/launcher.xml
parentcf51139c6e1d57b57177109f2177edc41edf5bbc (diff)
parent13ef17a37e683b8ad5800e9f542b411180fbec2f (diff)
downloadandroid_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.tar.gz
android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.tar.bz2
android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.zip
resolved conflicts for merge of 13ef17a3 to mnc-ub-dev
b/22609402 Change-Id: I80699d985088b9b79211284e710e8a6b8b90860b
Diffstat (limited to 'res/layout-sw720dp/launcher.xml')
-rw-r--r--res/layout-sw720dp/launcher.xml17
1 files changed, 11 insertions, 6 deletions
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 960ccf330..802922ec1 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -18,11 +18,9 @@
<com.android.launcher3.LauncherRootView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res-auto"
-
android:id="@+id/launcher"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/workspace_bg"
android:fitsSystemWindows="true">
<com.android.launcher3.DragLayer
@@ -36,6 +34,7 @@
android:layout_height="52dp" />
<!-- The workspace contains 5 screens of cells -->
+ <!-- DO NOT CHANGE THE ID -->
<com.android.launcher3.Workspace
android:id="@+id/workspace"
android:layout_width="match_parent"
@@ -44,6 +43,7 @@
launcher:pageIndicator="@id/page_indicator">
</com.android.launcher3.Workspace>
+ <!-- DO NOT CHANGE THE ID -->
<include layout="@layout/hotseat"
android:id="@+id/hotseat"
android:layout_width="match_parent"
@@ -59,15 +59,20 @@
<!-- Keep these behind the workspace so that they are not visible when
we go into AllApps -->
- <include
- android:id="@+id/page_indicator"
+ <include android:id="@+id/page_indicator"
layout="@layout/page_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
- <include layout="@layout/apps_customize_pane"
- android:id="@+id/apps_customize_pane"
+ <include layout="@layout/widgets_view"
+ android:id="@+id/widgets_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="invisible" />
+
+ <include layout="@layout/all_apps"
+ android:id="@+id/apps_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="invisible" />