Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-17 00:11:25 +00:00
committed by Android (Google) Code Review
parent 00d2556f71 8bcd04b7df
commit bf09a9fac0
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,7 +132,7 @@ public class StatusBarRemoteInputCallback implements Callback, Callbacks,
if (!row.isPinned()) { if (!row.isPinned()) {
mStatusBarStateController.setLeaveOpenOnKeyguardHide(true); mStatusBarStateController.setLeaveOpenOnKeyguardHide(true);
} }
mStatusBarKeyguardViewManager.showBouncer(true /* scrimmed */); mStatusBarKeyguardViewManager.showGenericBouncer(true /* scrimmed */);
mPendingRemoteInputView = clicked; mPendingRemoteInputView = clicked;
} }

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

@@ -26,6 +26,7 @@ import static org.mockito.internal.verification.VerificationModeFactory.times;
import android.content.Intent; import android.content.Intent;
import android.testing.AndroidTestingRunner; import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper; import android.testing.TestableLooper;
import android.view.View;
import androidx.test.filters.SmallTest; 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.SysuiStatusBarStateController;
import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.notification.NotificationEntryManager;
import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy; 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.DeviceProvisionedController;
import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.policy.KeyguardStateController;
import com.android.systemui.util.concurrency.FakeExecutor; import com.android.systemui.util.concurrency.FakeExecutor;
@@ -94,4 +96,11 @@ public class StatusBarRemoteInputCallbackTest extends SysuiTestCase {
verify(mRemoteInputCallback, times(1)).onWorkChallengeChanged(); verify(mRemoteInputCallback, times(1)).onWorkChallengeChanged();
} }
@Test
public void testShowGenericBouncer_onLockedRemoteInput() {
mRemoteInputCallback.onLockedRemoteInput(
mock(ExpandableNotificationRow.class), mock(View.class));
verify(mStatusBarKeyguardViewManager).showGenericBouncer(true);
}
} }