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

Adding docking checks for multi-window support. am: c694a509ff

Browse Source 
am: a903cc1b19

* commit 'a903cc1b19161888fbb50e847daee9c6ef9df6ea':
  Adding docking checks for multi-window support.
This commit is contained in:
Winson
2016-03-11 01:03:58 +00:00
committed by android-build-merger
parent 44085d45fd a903cc1b19
commit 986e4f0102
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;
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();

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
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();