diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java index b9a0f74058695..0b09accf2db14 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java @@ -72,6 +72,10 @@ public class Divider extends SystemUI { return mMinimized; } + public boolean isHomeStackResizable() { + return mHomeStackResizable; + } + private void addDivider(Configuration configuration) { mView = (DividerView) LayoutInflater.from(mContext).inflate(R.layout.docked_stack_divider, null); @@ -119,6 +123,7 @@ public class Divider extends SystemUI { mView.post(new Runnable() { @Override public void run() { + mHomeStackResizable = isHomeStackResizable; if (mMinimized != minimized) { mMinimized = minimized; updateTouchable(); diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java index 49035ba5bde54..6f59fe2001a18 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java @@ -1241,7 +1241,8 @@ public class DividerView extends FrameLayout implements OnTouchListener, public final void onBusEvent(UndockingTaskEvent undockingTaskEvent) { int dockSide = mWindowManagerProxy.getDockSide(); - if (dockSide != WindowManager.DOCKED_INVALID && !mDockedStackMinimized) { + if (dockSide != WindowManager.DOCKED_INVALID && (mHomeStackResizable + || !mDockedStackMinimized)) { startDragging(false /* animate */, false /* touching */); SnapTarget target = dockSideTopLeft(dockSide) ? mSnapAlgorithm.getDismissEndTarget() diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 638c12f3213e8..4d8d6a0bfa02b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -1501,7 +1501,7 @@ public class StatusBar extends SystemUI implements DemoMode, ActivityManager.DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT, null, metricsDockAction); } else { Divider divider = getComponent(Divider.class); - if (divider != null && divider.isMinimized()) { + if (divider != null && divider.isMinimized() && !divider.isHomeStackResizable()) { // Undocking from the minimized state is not supported return false; } else {