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

Commit 27c41677 authored by Tony Wickham's avatar Tony Wickham
Browse files

Don't create new nav bar layer when IME is rendering nav buttons 

Test: Edit folder name in taskbar, ensure we don't create a new window
Fixes: 214571910
Change-Id: I9a1385dbed2df7a4ee141485c8bbfb521457d853
parent f98b203d

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

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import android.graphics.Region; 
import android.graphics.Region.Op;

import android.graphics.drawable.AnimatedVectorDrawable;

import android.graphics.drawable.PaintDrawable;

import android.inputmethodservice.InputMethodService;

import android.util.Property;

import android.view.Gravity;

import android.view.MotionEvent;
@@ -602,6 +603,11 @@ public class NavbarButtonsViewController { 
            return;

        }



        if (InputMethodService.canImeRenderGesturalNavButtons() && mContext.isGestureNav()) {

            // IME is rendering the nav buttons, so we don't need to create a new layer for them.

            return;

        }



        mSeparateWindowParent.addOnAttachStateChangeListener(new OnAttachStateChangeListener() {

            @Override

            public void onViewAttachedToWindow(View view) {

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

+4 −0
Original line number Diff line number Diff line
@@ -240,6 +240,10 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 
        return mNavMode == Mode.THREE_BUTTONS;

    }



    public boolean isGestureNav() {

        return mNavMode == Mode.NO_BUTTON;

    }



    public int getLeftCornerRadius() {

        return mLeftCorner == null ? 0 : mLeftCorner.getRadius();

    }