From eccda9419d13cdf322dcda20eccf96e83bf921c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosmin=20B=C4=83ie=C8=99?= Date: Fri, 12 Jul 2024 09:50:20 +0200 Subject: [PATCH] Update IME switcher icon in taskbar This updates the icon of the IME switcher button used in taskbar. Test: show taskbar and verify icon manually Bug: 311791923 Flag: android.view.inputmethod.ime_switcher_revamp Change-Id: I0288601717ab9d0f6842766df62599c51c5a2b4f --- .../launcher3/taskbar/NavbarButtonsViewController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index 0fa3fbcab4..5c1e6387c5 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -80,6 +80,7 @@ import android.view.View.OnHoverListener; import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.view.WindowManager; +import android.view.inputmethod.Flags; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; @@ -274,7 +275,10 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT InputMethodService.canImeRenderGesturalNavButtons() && mContext.imeDrawsImeNavBar(); if (!mIsImeRenderingNavButtons) { // IME switcher - mImeSwitcherButton = addButton(R.drawable.ic_ime_switcher, BUTTON_IME_SWITCH, + final int switcherResId = Flags.imeSwitcherRevamp() + ? com.android.internal.R.drawable.ic_ime_switcher_new + : R.drawable.ic_ime_switcher; + mImeSwitcherButton = addButton(switcherResId, BUTTON_IME_SWITCH, isThreeButtonNav ? mStartContextualContainer : mEndContextualContainer, mControllers.navButtonController, R.id.ime_switcher); mPropertyHolders.add(new StatePropertyHolder(mImeSwitcherButton,