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

Commit 5b5dcbdc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Only add divider when it need to show"" into rvc-dev am: c944f5e9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863638

Change-Id: I04376d85cd910a9171cf4fca216bdd8f5e8faeb4
parents 3bed25d0 c944f5e9

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

+8 −5
Original line number Diff line number Diff line
@@ -253,10 +253,8 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, 
            mSplitLayout.mSecondary = new Rect(mRotateSplitLayout.mSecondary);

            mRotateSplitLayout = null;

        }

        if (isSplitActive()) {

        update(newConfig);

    }

    }



    Handler getHandler() {

        return mHandler;
@@ -330,6 +328,11 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, 
        mHandler.post(this::removeDivider);

    }



    void onTasksReady() {

        mHandler.post(() -> update(mDisplayController.getDisplayContext(

                mContext.getDisplayId()).getResources().getConfiguration()));

    }



    private void updateVisibility(final boolean visible) {

        if (DEBUG) Slog.d(TAG, "Updating visibility " + mVisible + "->" + visible);

        if (mVisible != visible) {
@@ -521,7 +524,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, 


    void ensureMinimizedSplit() {

        setHomeMinimized(true /* minimized */, mSplits.mSecondary.isResizable());

        if (mView != null && !isDividerVisible()) {

        if (!isDividerVisible()) {

            // Wasn't in split-mode yet, so enter now.

            if (DEBUG) {

                Slog.d(TAG, " entering split mode with minimized=true");
@@ -532,7 +535,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, 


    void ensureNormalSplit() {

        setHomeMinimized(false /* minimized */, mHomeStackResizable);

        if (mView != null && !isDividerVisible()) {

        if (!isDividerVisible()) {

            // Wasn't in split-mode, so enter now.

            if (DEBUG) {

                Slog.d(TAG, " enter split mode unminimized ");

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

+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ class SplitScreenTaskOrganizer extends TaskOrganizer { 
                t.setColor(mSecondaryDim, new float[]{0f, 0f, 0f});

                t.apply();

                releaseTransaction(t);



                mDivider.onTasksReady();

            }

        }

    }