Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd7499bb authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update IME switcher icon in taskbar" into main

parents 4997c142 eccda941

quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java

+5 −1
Original line number Diff line number Diff line
@@ -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,