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

Commit 9502131e authored by Bryce Lee's avatar Bryce Lee
Browse files

Suppress identical communal show requests. 

This changelist prevents multiple show requests from
being invoked on the CommunalHostViewController,
preventing unnecessary show cycles.

Bug: 195115696
Test: atest CommunalHostViewControllerTest#testMultipleShowRequestSuppression
Change-Id: Iec4dd0a04b93ccfdf88bbbc9576323cce076a280
parent 76f284a1

packages/SystemUI/src/com/android/systemui/communal/CommunalHostViewController.java

+51 −9
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ import com.google.common.util.concurrent.ListenableFuture; 
import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.ref.WeakReference;

import java.util.Objects;

import java.util.Optional;

import java.util.concurrent.Executor;



import javax.inject.Inject;
@@ -55,7 +57,8 @@ public class CommunalHostViewController extends ViewController<CommunalHostView> 
    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private final KeyguardStateController mKeyguardStateController;

    private final StatusBarStateController mStatusBarStateController;

    private WeakReference<CommunalSource> mLastSource;

    private WeakReference<CommunalSource> mCurrentSource;

    private Optional<ShowRequest> mLastRequest = Optional.empty();

    private int mState;

    private float mQsExpansion;

    private float mShadeExpansion;
@@ -78,6 +81,37 @@ public class CommunalHostViewController extends ViewController<CommunalHostView> 


    private ViewController<? extends View> mCommunalViewController;



    private static class ShowRequest {

        private boolean mShouldShow;

        private WeakReference<CommunalSource> mSource;



        ShowRequest(boolean shouldShow, WeakReference<CommunalSource> source) {

            mShouldShow = shouldShow;

            mSource = source;

        }



        CommunalSource getSource() {

            return mSource != null ? mSource.get() : null;

        }



        boolean shouldShow() {

            return mShouldShow;

        }



        @Override

        public boolean equals(Object o) {

            if (this == o) return true;

            if (!(o instanceof ShowRequest)) return false;

            ShowRequest that = (ShowRequest) o;

            return mShouldShow == that.mShouldShow && Objects.equals(getSource(), that.getSource());

        }



        @Override

        public int hashCode() {

            return Objects.hash(mShouldShow, mSource);

        }

    }



    private KeyguardUpdateMonitorCallback mKeyguardUpdateCallback =

            new KeyguardUpdateMonitorCallback() {

                @Override
@@ -253,18 +287,26 @@ public class CommunalHostViewController extends ViewController<CommunalHostView> 
    }



    private void showSource() {

        final ShowRequest request = new ShowRequest(

                (mState & SHOW_COMMUNAL_VIEW_REQUIRED_STATES) == SHOW_COMMUNAL_VIEW_REQUIRED_STATES

                    && (mState & SHOW_COMMUNAL_VIEW_INVALID_STATES) == 0

                    && mCurrentSource != null,

                mCurrentSource);



        if (mLastRequest.isPresent() && Objects.equals(mLastRequest.get(), request)) {

            return;

        }



        mLastRequest = Optional.of(request);



        // Make sure all necessary states are present for showing communal and all invalid states

        // are absent

        mMainExecutor.execute(() -> {

            final CommunalSource currentSource = mLastSource != null ? mLastSource.get() : null;



            if (DEBUG) {

                Log.d(TAG, "showSource. currentSource:" + currentSource);

                Log.d(TAG, "showSource. currentSource:" + request.getSource());

            }



            if ((mState & SHOW_COMMUNAL_VIEW_REQUIRED_STATES) == SHOW_COMMUNAL_VIEW_REQUIRED_STATES

                    && (mState & SHOW_COMMUNAL_VIEW_INVALID_STATES) == 0

                    && currentSource != null) {

            if (request.shouldShow()) {

                mView.removeAllViews();



                // Make view visible.
@@ -273,7 +315,7 @@ public class CommunalHostViewController extends ViewController<CommunalHostView> 
                final Context context = mView.getContext();



                final ListenableFuture<CommunalSource.CommunalViewResult> listenableFuture =

                        currentSource.requestCommunalView(context);

                        request.getSource().requestCommunalView(context);



                if (listenableFuture == null) {

                    Log.e(TAG, "could not request communal view");
@@ -308,7 +350,7 @@ public class CommunalHostViewController extends ViewController<CommunalHostView> 
     * @param source The new {@link CommunalSource}, {@code null} if not set.

     */

    public void show(WeakReference<CommunalSource> source) {

        mLastSource = source;

        mCurrentSource = source;

        showSource();

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+0 −2
Original line number Diff line number Diff line
@@ -4583,8 +4583,6 @@ public class NotificationPanelViewController extends PanelViewController { 
            mStatusBarStateController.removeCallback(mStatusBarStateListener);

            mConfigurationController.removeCallback(mConfigurationListener);

            mCommunalSourceMonitor.removeCallback(mCommunalSourceMonitorCallback);

            // Clear source when detached.

            setCommunalSource(null /*source*/);

            mFalsingManager.removeTapListener(mFalsingTapListener);

            mCommunalStateController.removeCallback(mCommunalStateCallback);

        }

packages/SystemUI/tests/src/com/android/systemui/communal/CommunalHostViewControllerTest.java

+16 −0
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 


package com.android.systemui.communal;



import static org.mockito.Mockito.any;

import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -226,4 +228,18 @@ public class CommunalHostViewControllerTest extends SysuiTestCase { 
        verify(mChildView).setAlpha(alpha);

        verify(mCommunalView).setAlpha(alpha);

    }



    @Test

    public void testMultipleShowRequestSuppression() {

        // Ensure first request invokes source.

        mController.show(new WeakReference<>(mCommunalSource));

        mFakeExecutor.runAllReady();

        verify(mCommunalSource).requestCommunalView(any());

        clearInvocations(mCommunalSource);



        // Ensure subsequent identical request is suppressed

        mController.show(new WeakReference<>(mCommunalSource));

        mFakeExecutor.runAllReady();

        verify(mCommunalSource, never()).requestCommunalView(any());

    }

}

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java

+0 −2
Original line number Diff line number Diff line
@@ -874,8 +874,6 @@ public class NotificationPanelViewTest extends SysuiTestCase { 
        clearInvocations(mCommunalHostViewController);

        givenViewDetached();

        verify(mCommunalSourceMonitor).removeCallback(any());

        verify(mCommunalHostViewController).show(sourceCapture.capture());

        assertThat(sourceCapture.getValue()).isEqualTo(null);

    }



    @Test