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

Commit 3c5ddcdc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Show the generic bouncer on remote input" into sc-dev am: bf09a9fa 

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

Change-Id: Ib28eff621cd0fe1170a807983b4a724e1b958ab7
parents b1eb8dab bf09a9fa

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

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ public class StatusBarRemoteInputCallback implements Callback, Callbacks, 
        if (!row.isPinned()) {

            mStatusBarStateController.setLeaveOpenOnKeyguardHide(true);

        }

        mStatusBarKeyguardViewManager.showBouncer(true /* scrimmed */);

        mStatusBarKeyguardViewManager.showGenericBouncer(true /* scrimmed */);

        mPendingRemoteInputView = clicked;

    }

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

+9 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static org.mockito.internal.verification.VerificationModeFactory.times; 
import android.content.Intent;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.view.View;



import androidx.test.filters.SmallTest;
@@ -37,6 +38,7 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager; 
import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.util.concurrency.FakeExecutor;
@@ -94,4 +96,11 @@ public class StatusBarRemoteInputCallbackTest extends SysuiTestCase { 
        verify(mRemoteInputCallback, times(1)).onWorkChallengeChanged();

    }



    @Test

    public void testShowGenericBouncer_onLockedRemoteInput() {

        mRemoteInputCallback.onLockedRemoteInput(

                mock(ExpandableNotificationRow.class), mock(View.class));



        verify(mStatusBarKeyguardViewManager).showGenericBouncer(true);

    }

}
 
 No newline at end of file