Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c694a509 authored by Winson's avatar Winson Committed by Winson Chung
Browse files

Adding docking checks for multi-window support. 

Bug: 27387257
Change-Id: I9f16302e1f9475225538871d9fc09c0706e4dbfb
parent 4064f608

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

+3 −1
Original line number Diff line number Diff line
@@ -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();

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

+2 −1
Original line number Diff line number Diff line
@@ -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();