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

Commit f5988173 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: a73d6ecb am:... 

Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb am: dbe75976 am: ed4937c3 am: 6bcf2f47

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

Change-Id: Ie7fe1337675aadfa8b147463a411d9fc62c42c0c
parents c97010af 6bcf2f47

core/java/android/view/WindowlessWindowManager.java

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ public class WindowlessWindowManager implements IWindowSession { 
    private final static String TAG = "WindowlessWindowManager";



    private class State {

        //TODO : b/150190730 we should create it when view show and release it when view invisible.

        SurfaceControl mSurfaceControl;

        WindowManager.LayoutParams mParams = new WindowManager.LayoutParams();

        int mDisplayId;

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) {
@@ -524,7 +521,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, 


    void ensureMinimizedSplit() {

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

        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");
@@ -535,7 +532,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();

            }

        }

    }