Hide window swapping behind a flag

am: 6885598

* commit '6885598ba09b18038e61f268231aa53ed08ef44c':
  Hide window swapping behind a flag
This commit is contained in:
Jorim Jaggi
2016-03-26 02:01:19 +00:00
committed by android-build-merger

View File

@@ -83,6 +83,7 @@ public class DividerView extends FrameLayout implements OnTouchListener,
private static final String TAG = "DividerView"; private static final String TAG = "DividerView";
private static final int TASK_POSITION_SAME = Integer.MAX_VALUE; private static final int TASK_POSITION_SAME = Integer.MAX_VALUE;
private static final boolean SWAPPING_ENABLED = false;
/** /**
* How much the background gets scaled when we are in the minimized dock state. * How much the background gets scaled when we are in the minimized dock state.
@@ -213,12 +214,14 @@ public class DividerView extends FrameLayout implements OnTouchListener,
mGestureDetector = new GestureDetector(mContext, new SimpleOnGestureListener() { mGestureDetector = new GestureDetector(mContext, new SimpleOnGestureListener() {
@Override @Override
public boolean onSingleTapUp(MotionEvent e) { public boolean onSingleTapUp(MotionEvent e) {
updateDockSide(); if (SWAPPING_ENABLED) {
SystemServicesProxy ssp = Recents.getSystemServices(); updateDockSide();
if (mDockSide != WindowManager.DOCKED_INVALID SystemServicesProxy ssp = Recents.getSystemServices();
&& !ssp.isRecentsTopMost(ssp.getTopMostTask(), null /* isTopHome */)) { if (mDockSide != WindowManager.DOCKED_INVALID
mWindowManagerProxy.swapTasks(); && !ssp.isRecentsTopMost(ssp.getTopMostTask(), null /* isTopHome */)) {
return true; mWindowManagerProxy.swapTasks();
return true;
}
} }
return false; return false;
} }