summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorTony <twickham@google.com>2019-03-03 15:32:12 -0800
committerTony <twickham@google.com>2019-03-03 15:43:50 -0800
commit4bb4b89b9a677ae3548fefdcbc11be9bd906c24a (patch)
treea2adacb392e5c6c4f23e55e634f6427017383840 /res/layout
parent9db9d62b278c69ba62993696f0456ab5c0e39a95 (diff)
downloadandroid_packages_apps_Trebuchet-4bb4b89b9a677ae3548fefdcbc11be9bd906c24a.tar.gz
android_packages_apps_Trebuchet-4bb4b89b9a677ae3548fefdcbc11be9bd906c24a.tar.bz2
android_packages_apps_Trebuchet-4bb4b89b9a677ae3548fefdcbc11be9bd906c24a.zip
Scale and translate hotseat with workspace instead of all apps
- Move the hotseat alongside workspace instead of on top of all apps in xml layout - Set pivot point of hotseat to match the workspace's, and apply the same scale - Translate the hotseat with the workspace instead of all apps - SpringLoadedState does not scale or translate the hotseat Change-Id: Ic45fe99f83f0e0012afa78073d9577e65da444e2
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/launcher.xml18
1 files changed, 9 insertions, 9 deletions
diff --git a/res/layout/launcher.xml b/res/layout/launcher.xml
index 91c37054b..c9cea8062 100644
--- a/res/layout/launcher.xml
+++ b/res/layout/launcher.xml
@@ -38,6 +38,15 @@
android:theme="@style/HomeScreenElementTheme"
launcher:pageIndicator="@+id/page_indicator" />
+ <!-- DO NOT CHANGE THE ID -->
+ <com.android.launcher3.Hotseat
+ android:id="@+id/hotseat"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:theme="@style/HomeScreenElementTheme"
+ android:importantForAccessibility="no"
+ launcher:containerType="hotseat" />
+
<include
android:id="@+id/overview_panel"
layout="@layout/overview_panel"
@@ -71,15 +80,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
- <!-- DO NOT CHANGE THE ID -->
- <com.android.launcher3.Hotseat
- android:id="@+id/hotseat"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:theme="@style/HomeScreenElementTheme"
- android:importantForAccessibility="no"
- launcher:containerType="hotseat" />
-
</com.android.launcher3.dragndrop.DragLayer>
</com.android.launcher3.LauncherRootView>