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

Commit 5ee6fd6f authored by Tony Huang's avatar Tony Huang Committed by Android (Google) Code Review
Browse files

Merge "Let activity resume after bubbles expanded" into rvc-dev

parents 06b2e1cb 86724108
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import static com.android.systemui.bubbles.BubbleDebugConfig.TAG_BUBBLES;
import static com.android.systemui.bubbles.BubbleDebugConfig.TAG_WITH_CLASS_NAME;

import android.annotation.SuppressLint;
import android.app.ActivityManager;
import android.app.ActivityOptions;
import android.app.ActivityTaskManager;
import android.app.ActivityView;
@@ -126,6 +127,7 @@ public class BubbleExpandedView extends LinearLayout {

    private BubbleController mBubbleController = Dependency.get(BubbleController.class);
    private WindowManager mWindowManager;
    private ActivityManager mActivityManager;

    private BubbleStackView mStackView;
    private View mVirtualImeView;
@@ -191,6 +193,10 @@ public class BubbleExpandedView extends LinearLayout {
                        }
                    });
                    mActivityViewStatus = ActivityViewStatus.ACTIVITY_STARTED;
                    break;
                case ACTIVITY_STARTED:
                    post(() -> mActivityManager.moveTaskToFront(mTaskId, 0));
                    break;
            }
        }

@@ -252,6 +258,7 @@ public class BubbleExpandedView extends LinearLayout {
            int defStyleRes) {
        super(context, attrs, defStyleAttr, defStyleRes);
        updateDimensions();
        mActivityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
    }

    void updateDimensions() {