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

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

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

Merge "Revert "Only add divider when it need to show"" into rvc-dev am: 77db95ce am: 778d6830 am: 5d9a7cec

Change-Id: I7951a00faacfe8ea692affd5d81956f42a2ecb6c
parents 32db5c4e 5d9a7cec
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 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;
+6 −4
Original line number Diff line number Diff line
@@ -238,11 +238,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;
@@ -316,6 +313,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) {
+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();
            }
        }
    }