diff options
| author | Vinit Nayak <peanutbutter@google.com> | 2021-11-19 17:27:17 -0800 |
|---|---|---|
| committer | Vinit Nayak <peanutbutter@google.com> | 2021-11-22 17:32:16 -0800 |
| commit | bca13abc82879977dde43ee7cb4b51e2e47886bb (patch) | |
| tree | 7eb738259f4666365c2a0e421661e5a06360802b /quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java | |
| parent | 426b021e22345f6015263f23a3a86af39f3fa542 (diff) | |
Invoke Assistant on 3 button long click on Taskbar
Bug: 204273914
Change-Id: I757fa40ad9ac0ace44b57c7dd08ec30b4c0ae6d0
Diffstat (limited to 'quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java')
| -rw-r--r-- | quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index 787aa19410..0565f7e976 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -17,7 +17,6 @@ package com.android.launcher3.taskbar; 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_A11Y_LONG_CLICK; 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; @@ -90,7 +89,6 @@ public class NavbarButtonsViewController { private static final int MASK_IME_SWITCHER_VISIBLE = FLAG_SWITCHER_SUPPORTED | FLAG_IME_VISIBLE; - private View.OnLongClickListener mA11yLongClickListener; private final ArrayList<StatePropertyHolder> mPropertyHolders = new ArrayList<>(); private final ArrayList<ImageView> mAllButtons = new ArrayList<>(); private int mState; @@ -142,11 +140,6 @@ public class NavbarButtonsViewController { mNavButtonsView.getLayoutParams().height = mContext.getDeviceProfile().taskbarSize; mNavButtonTranslationYMultiplier.value = 1; - mA11yLongClickListener = view -> { - mControllers.navButtonController.onButtonClick(BUTTON_A11Y_LONG_CLICK); - return true; - }; - mPropertyHolders.add(new StatePropertyHolder( mControllers.taskbarViewController.getTaskbarIconAlpha() .getProperty(ALPHA_INDEX_IME), @@ -285,7 +278,6 @@ public class NavbarButtonsViewController { mPropertyHolders.add(new StatePropertyHolder(mA11yButton, flags -> (flags & FLAG_A11Y_VISIBLE) != 0 && (flags & FLAG_ROTATION_BUTTON_VISIBLE) == 0)); - mA11yButton.setOnLongClickListener(mA11yLongClickListener); } private void parseSystemUiFlags(int sysUiStateFlags) { @@ -441,6 +433,8 @@ public class NavbarButtonsViewController { ImageView buttonView = addButton(parent, id, layoutId); buttonView.setImageResource(drawableId); buttonView.setOnClickListener(view -> navButtonController.onButtonClick(buttonType)); + buttonView.setOnLongClickListener(view -> + navButtonController.onButtonLongClick(buttonType)); return buttonView; } |