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

Merge "Toggle notifications panel via actions shortcut" into udc-dev am: df01fc8495 am: 5b25b31a0a

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

Change-Id: I01e435c2f37c4a9fdb9596d04866c35ca679a783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Josep del Río
2023-02-25 17:19:44 +00:00
committed by Automerger Merge Worker
parent 75f0607283 5b25b31a0a
commit 632a085e78
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -2978,15 +2978,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
break;
case KeyEvent.KEYCODE_N:
if (down && event.isMetaPressed()) {
IStatusBarService service = getStatusBarService();
if (service != null) {
try {
service.expandNotificationsPanel();
} catch (RemoteException e) {
// do nothing.
}
return key_consumed;
}
toggleNotificationPanel();
return key_consumed;
}
break;
case KeyEvent.KEYCODE_S:

4
services/tests/wmtests/src/com/android/server/policy/ModifierShortcutTests.java
View File

@@ -141,9 +141,9 @@ public class ModifierShortcutTests extends ShortcutKeyTestBase {
*/
@Test
public void testMetaN() throws RemoteException {
mPhoneWindowManager.overrideExpandNotificationsPanel();
mPhoneWindowManager.overrideTogglePanel();
sendKeyCombination(new int[]{KEYCODE_META_LEFT, KEYCODE_N}, 0);
mPhoneWindowManager.assertExpandNotification();
mPhoneWindowManager.assertTogglePanel();
}
/**

8
services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java
View File

@@ -322,12 +322,12 @@ class TestPhoneWindowManager {
doReturn(true).when(mTelecomManager).endCall();
}
void overrideExpandNotificationsPanel() {
void overrideTogglePanel() {
// Can't directly mock on IStatusbarService, use spyOn and override the specific api.
mPhoneWindowManager.getStatusBarService();
spyOn(mPhoneWindowManager.mStatusBarService);
try {
doNothing().when(mPhoneWindowManager.mStatusBarService).expandNotificationsPanel();
doNothing().when(mPhoneWindowManager.mStatusBarService).togglePanel();
} catch (RemoteException e) {
e.printStackTrace();
}
@@ -428,9 +428,9 @@ class TestPhoneWindowManager {
Assert.assertTrue(intentCaptor.getValue().getAction() == Intent.ACTION_BUG_REPORT);
}
void assertExpandNotification() throws RemoteException {
void assertTogglePanel() throws RemoteException {
waitForIdle();
verify(mPhoneWindowManager.mStatusBarService).expandNotificationsPanel();
verify(mPhoneWindowManager.mStatusBarService).togglePanel();
}
void assertToggleShortcutsMenu() {