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

Commit a903cc1b authored by Winson's avatar Winson Committed by android-build-merger
Browse files

Adding docking checks for multi-window support. 

am: c694a509

* commit 'c694a509':
  Adding docking checks for multi-window support.
parents 412f1c9e c694a509

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

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

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

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