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

Commit 9f51b5a1 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

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

Merge "Only add divider when it need to show" into rvc-dev am: c27a155d am: e60b3fc4 am: a5c0086f am: 28b4f441

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

Change-Id: I80b57ee8e71db21ead3edf36b931b0b4d7dab1f8
parents 32df476f 28b4f441

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

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

            mRotateSplitLayout = null;

        }

        if (isSplitActive()) {

            update(newConfig);

        }

    }



    Handler getHandler() {

        return mHandler;
@@ -328,11 +330,6 @@ 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) {
@@ -534,7 +531,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, 


    void ensureMinimizedSplit() {

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

        if (!isDividerVisible()) {

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

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

            if (DEBUG) {

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


    void ensureNormalSplit() {

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

        if (!isDividerVisible()) {

        if (mView != null && !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

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

                t.apply();

                releaseTransaction(t);



                mDivider.onTasksReady();

            }

        }

    }