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

Merge "Disassociate system windows from apps" into mnc-dr-dev

Browse Source
This commit is contained in:
Wale Ogunwale
2015-10-16 16:14:45 +00:00
committed by Android (Google) Code Review
parent 8d6d735fa8 20ebb4c2d4
commit be6555105a
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/view/Window.java
View File

@@ -607,6 +607,19 @@ public abstract class Window {
} }
wp.setTitle(title); wp.setTitle(title);
} }
} else if (wp.type >= WindowManager.LayoutParams.FIRST_SYSTEM_WINDOW &&
wp.type <= WindowManager.LayoutParams.LAST_SYSTEM_WINDOW) {
// We don't set the app token to this system window because the life cycles should be
// independent. If an app creates a system window and then the app goes to the stopped
// state, the system window should not be affected (can still show and receive input
// events).
if (curTitle == null || curTitle.length() == 0) {
String title = "Sys" + Integer.toString(wp.type);
if (mAppName != null) {
title += ":" + mAppName;
}
wp.setTitle(title);
}
} else { } else {
if (wp.token == null) { if (wp.token == null) {
wp.token = mContainer == null ? mAppToken : mContainer.mAppToken; wp.token = mContainer == null ? mAppToken : mContainer.mAppToken;