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

Commit dbfa9fb3 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Reset Divider#mMinimized when dismiss split" into rvc-dev am: 9e747a55 am: c7391742 

Change-Id: Idab7520595cf86e6bd19a0f8db9e7a83153e750c
parents db899955 c7391742

packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java

+5 −0
Original line number Diff line number Diff line
@@ -634,6 +634,11 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, 
        }

    }



    void onSplitDismissed() {

        mMinimized = false;

        updateVisibility(false /* visible */);

    }



    /** Switch to minimized state if appropriate */

    public void setMinimized(final boolean minimized) {

        if (DEBUG) Slog.d(TAG, "posting ext setMinimized " + minimized + " vis:" + mVisible);

packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ class SplitScreenTaskOrganizer extends TaskOrganizer { 
                            + mPrimary.topActivityType + "  " + mSecondary.topActivityType);

                }

                WindowManagerProxy.applyDismissSplit(this, true /* dismissOrMaximize */);

                mDivider.updateVisibility(false /* visible */);

                mDivider.onSplitDismissed();

            } else if (!primaryIsEmpty && primaryWasEmpty && secondaryWasEmpty) {

                // Wasn't in split-mode (both were empty), but now that the primary split is

                // populated, we should fully enter split by moving everything else into secondary.