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

Browse Source
This commit is contained in:
Josep del Río
2023-02-25 16:23:49 +00:00
committed by Android (Google) Code Review
parent 43b60a11ff d7e5d6da36
commit df01fc8495
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -141,9 +141,9 @@ public class ModifierShortcutTests extends ShortcutKeyTestBase {
*/ */
@Test @Test
public void testMetaN() throws RemoteException { public void testMetaN() throws RemoteException {
mPhoneWindowManager.overrideExpandNotificationsPanel(); mPhoneWindowManager.overrideTogglePanel();
sendKeyCombination(new int[]{KEYCODE_META_LEFT, KEYCODE_N}, 0); 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(); doReturn(true).when(mTelecomManager).endCall();
} }
void overrideExpandNotificationsPanel() { void overrideTogglePanel() {
// Can't directly mock on IStatusbarService, use spyOn and override the specific api. // Can't directly mock on IStatusbarService, use spyOn and override the specific api.
mPhoneWindowManager.getStatusBarService(); mPhoneWindowManager.getStatusBarService();
spyOn(mPhoneWindowManager.mStatusBarService); spyOn(mPhoneWindowManager.mStatusBarService);
try { try {
doNothing().when(mPhoneWindowManager.mStatusBarService).expandNotificationsPanel(); doNothing().when(mPhoneWindowManager.mStatusBarService).togglePanel();
} catch (RemoteException e) { } catch (RemoteException e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -428,9 +428,9 @@ class TestPhoneWindowManager {
Assert.assertTrue(intentCaptor.getValue().getAction() == Intent.ACTION_BUG_REPORT); Assert.assertTrue(intentCaptor.getValue().getAction() == Intent.ACTION_BUG_REPORT);
} }
void assertExpandNotification() throws RemoteException { void assertTogglePanel() throws RemoteException {
waitForIdle(); waitForIdle();
verify(mPhoneWindowManager.mStatusBarService).expandNotificationsPanel(); verify(mPhoneWindowManager.mStatusBarService).togglePanel();
} }
void assertToggleShortcutsMenu() { void assertToggleShortcutsMenu() {