From 8bcd04b7dfcaeb3f5ced739c30cd7c5453977c23 Mon Sep 17 00:00:00 2001 From: Beverly Date: Fri, 16 Jul 2021 12:04:03 -0400 Subject: Show the generic bouncer on remote input Instead of directly showing the pin/pattern/password bouncer. Test: manual, atest StatusBarRemoteInputCallbackTest Fixes: 192869012 Change-Id: Ia38a6b5569d63ca37f4cdba922f60f0359c38dd7 --- .../systemui/statusbar/phone/StatusBarRemoteInputCallback.java | 2 +- .../statusbar/phone/StatusBarRemoteInputCallbackTest.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java index 95712cd303f5..262dc837f22c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java @@ -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; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallbackTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallbackTest.java index 9a5e948b762d..1fc1473adf19 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallbackTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallbackTest.java @@ -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 -- cgit v1.2.3-59-g8ed1b