Merge changes from topic "kingyo-new-buttons-master"

* changes:
  Toggle notification panel when new buttons are clicked in taskbar
  Add new buttons to taskbar
This commit is contained in:
Shuming Hao
2021-12-15 16:49:19 +00:00
committed by Android (Google) Code Review
6 changed files with 70 additions and 1 deletions

View File

@@ -16,7 +16,6 @@
package com.android.launcher3.taskbar;
import static com.android.internal.app.AssistUtils.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS;
import static com.android.internal.app.AssistUtils.INVOCATION_TYPE_KEY;
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;
@@ -58,6 +57,8 @@ public class TaskbarNavButtonController {
BUTTON_RECENTS,
BUTTON_IME_SWITCH,
BUTTON_A11Y,
BUTTON_QUICK_SETTINGS,
BUTTON_NOTIFICATIONS,
})
public @interface TaskbarButton {}
@@ -67,6 +68,8 @@ public class TaskbarNavButtonController {
static final int BUTTON_RECENTS = BUTTON_HOME << 1;
static final int BUTTON_IME_SWITCH = BUTTON_RECENTS << 1;
static final int BUTTON_A11Y = BUTTON_IME_SWITCH << 1;
static final int BUTTON_QUICK_SETTINGS = BUTTON_A11Y << 1;
static final int BUTTON_NOTIFICATIONS = BUTTON_QUICK_SETTINGS << 1;
private static final int SCREEN_UNPIN_COMBO = BUTTON_BACK | BUTTON_RECENTS;
private int mLongPressedButtons = 0;
@@ -101,6 +104,12 @@ public class TaskbarNavButtonController {
case BUTTON_A11Y:
notifyA11yClick(false /* longClick */);
break;
case BUTTON_QUICK_SETTINGS:
showQuickSettings();
break;
case BUTTON_NOTIFICATIONS:
showNotifications();
break;
}
}
@@ -221,4 +230,12 @@ public class TaskbarNavButtonController {
args.putInt(INVOCATION_TYPE_KEY, INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS);
mSystemUiProxy.startAssistant(args);
}
private void showQuickSettings() {
mSystemUiProxy.toggleNotificationPanel();
}
private void showNotifications() {
mSystemUiProxy.toggleNotificationPanel();
}
}