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

Commit ca8244d8 authored by Mady Mellor's avatar Mady Mellor
Browse files

Fix IME always focusing bubbles 

Test: have a bubble, open it, focus IME, remove bubble, open anything else
      and check that the IME still works.
Fixes: 172977221
Change-Id: I73d57d81d274f5af0e8f69e158f3ccb862e0d379
parent f929cba2

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java

+9 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import static com.android.wm.shell.bubbles.BubbleOverflowActivity.EXTRA_BUBBLE_C 
import android.annotation.NonNull;

import android.annotation.SuppressLint;

import android.app.ActivityOptions;

import android.app.ActivityTaskManager;

import android.app.PendingIntent;

import android.content.ComponentName;

import android.content.Context;
@@ -41,6 +42,7 @@ import android.graphics.Outline; 
import android.graphics.Rect;

import android.graphics.drawable.ShapeDrawable;

import android.os.Bundle;

import android.os.RemoteException;

import android.util.AttributeSet;

import android.util.Log;

import android.view.SurfaceControl;
@@ -645,6 +647,13 @@ public class BubbleExpandedView extends LinearLayout { 
        if (DEBUG_BUBBLE_EXPANDED_VIEW) {

            Log.d(TAG, "cleanUpExpandedState: bubble=" + getBubbleKey() + " task=" + mTaskId);

        }

        if (getTaskId() != INVALID_TASK_ID) {

            try {

                ActivityTaskManager.getService().removeTask(getTaskId());

            } catch (RemoteException e) {

                Log.w(TAG, e.getMessage());

            }

        }

        if (mTaskView != null) {

            mTaskView.release();

        }