| commit | d43f814723fef28baebe3ef69fd0e2d9fd66142a | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 29 22:26:52 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 29 22:26:52 2021 +0000 |
| tree | 28887dc9e3ee0e99014759e26e0da7cf6fcc83ed | |
| parent | da97d700905cf6cb588a4a31e96986e609f60318 [diff] | |
| parent | 543d5c511a25a7902db9566fdb16b2e5bbab6284 [diff] |
Merge "Fixing hotseat hidden in 3P Launcher" into sc-v2-dev am: eb6391ff8d am: 543d5c511a Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15422854 Change-Id: Iee516fccb11fe8b1ad7d36303a121723964885e2
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 740bf5a..2df4b70 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java
@@ -257,7 +257,8 @@ final Resources res = context.getResources(); hotseatQsbHeight = res.getDimensionPixelSize(R.dimen.qsb_widget_height); - isTaskbarPresent = isTablet && FeatureFlags.ENABLE_TASKBAR.get(); + isTaskbarPresent = isTablet && ApiWrapper.TASKBAR_DRAWN_IN_PROCESS + && FeatureFlags.ENABLE_TASKBAR.get(); if (isTaskbarPresent) { // Taskbar will be added later, but provides bottom insets that we should subtract // from availableHeightPx.