| commit | 543d5c511a25a7902db9566fdb16b2e5bbab6284 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 29 22:10:20 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 29 22:10:20 2021 +0000 |
| tree | 5d11173a5f33de3352cbc38c572c1a0a6a8b2e95 | |
| parent | f3c061ebdfd10e647d1525abddf98e5f4c45f440 [diff] | |
| parent | eb6391ff8d3d0c13cf6b4e1ccdb7d86de1d2afec [diff] |
Merge "Fixing hotseat hidden in 3P Launcher" into sc-v2-dev am: eb6391ff8d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15422854 Change-Id: Ibdb4f4db7f42f4b1c68f7ca265d926be5bd83f2f
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.