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

Commit 29e6f749 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: 8acb04e2 am: 5394166f 

Change-Id: I55e15d386623ac4cce7bf8d0a7ab4502cdf00d83
parents 554df2b5 5394166f

core/java/android/view/WindowlessWindowManager.java

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

    private final static String TAG = "WindowlessWindowManager";





    private class State {

    private class State {

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

        SurfaceControl mSurfaceControl;

        SurfaceControl mSurfaceControl;

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

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

        int mDisplayId;

        int mDisplayId;

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

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

            mSplitLayout.mSecondary = new Rect(mRotateSplitLayout.mSecondary);

            mRotateSplitLayout = null;

            mRotateSplitLayout = null;

        }

        }



        if (isSplitActive()) {

            update(newConfig);

            update(newConfig);

        }

        }

    }





    Handler getHandler() {

    Handler getHandler() {

        return mHandler;

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

        mHandler.post(this::removeDivider);

    }

    }





    void onTasksReady() {

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

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

    }



    private void updateVisibility(final boolean visible) {

    private void updateVisibility(final boolean visible) {

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

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

        if (mVisible != visible) {

        if (mVisible != visible) {

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

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

                t.setColor(mSecondaryDim, new float[]{0f, 0f, 0f});

                t.apply();

                t.apply();

                releaseTransaction(t);

                releaseTransaction(t);



                mDivider.onTasksReady();

            }

            }

        }

        }

    }

    }