Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Let activity resume after bubbles expanded" into rvc-dev am: 5ee6fd6f43

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833785

Change-Id: I9640c8dd86540f172489f3e17605ff5fdc0030ce
This commit is contained in:
Tony Huang
2020-06-17 03:34:18 +00:00
committed by Automerger Merge Worker
parent 29e59cf89e 5ee6fd6f43
commit 943d53ddd3
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
View File

@@ -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() {