Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding docking checks for multi-window support.

Browse Source 
Bug: 27387257
Change-Id: I9f16302e1f9475225538871d9fc09c0706e4dbfb
This commit is contained in:
Winson
2016-03-10 16:35:03 -08:00
committed by Winson Chung
parent 4064f60831
commit c694a509ff
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
View File

@@ -16,6 +16,7 @@
package com.android.systemui.recents.views; package com.android.systemui.recents.views;
import android.app.ActivityManager;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.graphics.Point; import android.graphics.Point;
import android.view.MotionEvent; import android.view.MotionEvent;
@@ -149,7 +150,8 @@ public class RecentsViewTouchHandler {
mTaskView.setTranslationY(y); mTaskView.setTranslationY(y);
mVisibleDockStates.clear(); mVisibleDockStates.clear();
if (!ssp.hasDockedTask() && mRv.getTaskStack().getTaskCount() > 1) { if (ActivityManager.supportsMultiWindow() &&
!ssp.hasDockedTask() && mRv.getTaskStack().getTaskCount() > 1) {
if (!event.task.isDockable) { if (!event.task.isDockable) {
Toast.makeText(mRv.getContext(), R.string.recents_drag_non_dockable_task_message, Toast.makeText(mRv.getContext(), R.string.recents_drag_non_dockable_task_message,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -1149,9 +1149,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
@Override @Override
public boolean onLongClick(View v) { public boolean onLongClick(View v) {
if (mRecents == null) { if (mRecents == null || !ActivityManager.supportsMultiWindow()) {
return false; return false;
} }
boolean initiallyDocked = WindowManagerProxy.getInstance().getDockSide() boolean initiallyDocked = WindowManagerProxy.getInstance().getDockSide()
== WindowManager.DOCKED_INVALID; == WindowManager.DOCKED_INVALID;
boolean dockedAtEnd = toggleSplitScreenMode(); boolean dockedAtEnd = toggleSplitScreenMode();