Merge "Update IME switcher icon in taskbar" into main

This commit is contained in:
Treehugger Robot authored and Android (Google) Code Review committed 2024-07-17 15:37:50 +00:00
commit fd7499bb82
1 file changed
+5 -1
@@ -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,