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

@@ -15,11 +15,15 @@
*/
package com.android.launcher3.taskbar;
import static android.content.pm.PackageManager.FEATURE_PC;
import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X;
import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_A11Y;
import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_BACK;
import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_HOME;
import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_IME_SWITCH;
import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_NOTIFICATIONS;
import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_QUICK_SETTINGS;
import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_RECENTS;
import static com.android.launcher3.taskbar.TaskbarViewController.ALPHA_INDEX_KEYGUARD;
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE;
@@ -246,6 +250,17 @@ public class NavbarButtonsViewController {
applyState();
mPropertyHolders.forEach(StatePropertyHolder::endAnimation);
// quick setting and notification buttons
if (mContext.getPackageManager().hasSystemFeature(FEATURE_PC)) {
addButton(R.drawable.ic_sysbar_quick_settings, BUTTON_QUICK_SETTINGS,
mNavButtonContainer, mControllers.navButtonController,
R.id.quick_settings_button);
addButton(R.drawable.ic_sysbar_notifications, BUTTON_NOTIFICATIONS,
mNavButtonContainer, mControllers.navButtonController,
R.id.notifications_button);
}
}
private void initButtons(ViewGroup navContainer, ViewGroup endContainer,