diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java index d1fa2fd3ef..5b301433c3 100644 --- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java @@ -222,7 +222,7 @@ public abstract class BaseQuickstepLauncher extends Launcher mTaskbarController.cleanup(); mTaskbarController = null; } - if (FeatureFlags.ENABLE_TASKBAR.get() && mDeviceProfile.isTablet) { + if (mDeviceProfile.isTaskbarPresent) { TaskbarActivityContext taskbarActivityContext = new TaskbarActivityContext(this); mTaskbarController = new TaskbarController(this, taskbarActivityContext.getTaskbarContainerView()); diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java index f53a5efe95..7d494c28bf 100644 --- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java +++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java @@ -130,7 +130,7 @@ public class PredictionRowView extends LinearLayout implements if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) { mDecorationHandler = new AllAppsSectionDecorator.SectionDecorationHandler(getContext(), - false); + false, 0, true, true); } updateVisibility(); @@ -164,7 +164,7 @@ public class PredictionRowView extends LinearLayout implements for (int i = 0; i < childrenCount; i++) { mDecorationHandler.extendBounds(getChildAt(i)); } - mDecorationHandler.onDraw(canvas); + mDecorationHandler.onGroupDraw(canvas); mDecorationHandler.onFocusDraw(canvas, getFocusedChild()); mLauncher.getAppsView().getActiveRecyclerView().invalidateItemDecorations(); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java index ab05fbf036..5dddaf3ed0 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java @@ -89,8 +89,7 @@ public class TaskbarController { mTaskbarView = mTaskbarContainerView.findViewById(R.id.taskbar_view); mTaskbarView.construct(createTaskbarViewCallbacks()); mWindowManager = mLauncher.getWindowManager(); - mTaskbarSize = new Point(MATCH_PARENT, - mLauncher.getResources().getDimensionPixelSize(R.dimen.taskbar_size)); + mTaskbarSize = new Point(MATCH_PARENT, mLauncher.getDeviceProfile().taskbarSize); mTaskbarStateHandler = mLauncher.getTaskbarStateHandler(); mTaskbarVisibilityController = new TaskbarVisibilityController(mLauncher, createTaskbarVisibilityControllerCallbacks()); @@ -233,14 +232,10 @@ public class TaskbarController { } private void removeFromWindowManager() { - if (mTaskbarContainerView.isAttachedToWindow()) { - mWindowManager.removeViewImmediate(mTaskbarContainerView); - } + mWindowManager.removeViewImmediate(mTaskbarContainerView); } private void addToWindowManager() { - removeFromWindowManager(); - final int gravity = Gravity.BOTTOM; mWindowLayoutParams = new WindowManager.LayoutParams( @@ -378,7 +373,8 @@ public class TaskbarController { * @return Whether the given View is in the same window as Taskbar. */ public boolean isViewInTaskbar(View v) { - return mTaskbarContainerView.getWindowId().equals(v.getWindowId()); + return mTaskbarContainerView.isAttachedToWindow() + && mTaskbarContainerView.getWindowId().equals(v.getWindowId()); } /** diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml index 0041c9a7c8..8ed16c7493 100644 --- a/res/layout/all_apps.xml +++ b/res/layout/all_apps.xml @@ -40,35 +40,7 @@ - - -