diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java index 079d7b9148f09..84590f25149f3 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java @@ -16,6 +16,7 @@ package com.android.systemui.recents.views; +import android.app.ActivityManager; import android.content.res.Configuration; import android.graphics.Point; import android.view.MotionEvent; @@ -149,7 +150,8 @@ public class RecentsViewTouchHandler { mTaskView.setTranslationY(y); mVisibleDockStates.clear(); - if (!ssp.hasDockedTask() && mRv.getTaskStack().getTaskCount() > 1) { + if (ActivityManager.supportsMultiWindow() && + !ssp.hasDockedTask() && mRv.getTaskStack().getTaskCount() > 1) { if (!event.task.isDockable) { Toast.makeText(mRv.getContext(), R.string.recents_drag_non_dockable_task_message, Toast.LENGTH_SHORT).show(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 222709aba41d2..8cfda3f4e036d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -1149,9 +1149,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, @Override public boolean onLongClick(View v) { - if (mRecents == null) { + if (mRecents == null || !ActivityManager.supportsMultiWindow()) { return false; } + boolean initiallyDocked = WindowManagerProxy.getInstance().getDockSide() == WindowManager.DOCKED_INVALID; boolean dockedAtEnd = toggleSplitScreenMode();