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

Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-12 21:00:21 +00:00
committed by Android (Google) Code Review
parent 0a8ecc6886 59e8e3d747
commit 39c3d2cf16
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -719,16 +719,21 @@ class DisplayContent {
boolean canAddToastWindowForUid(int uid) { boolean canAddToastWindowForUid(int uid) {
// We allow one toast window per UID being shown at a time. // We allow one toast window per UID being shown at a time.
WindowList windows = getWindowList(); // Also if the app is focused adding more than one toast at
final int windowCount = windows.size(); // a time for better backwards compatibility.
boolean alreadyHasToastWindow = false;
final int windowCount = mWindows.size();
for (int i = 0; i < windowCount; i++) { for (int i = 0; i < windowCount; i++) {
WindowState window = windows.get(i); final WindowState window = mWindows.get(i);
if (window.mAttrs.type == TYPE_TOAST && window.mOwnerUid == uid if (window.isFocused() && window.getOwningUid() == uid) {
return true;
}
if (window.mAttrs.type == TYPE_TOAST && window.getOwningUid() == uid
&& !window.isRemovedOrHidden()) { && !window.isRemovedOrHidden()) {
return false; alreadyHasToastWindow = true;
} }
} }
return true; return !alreadyHasToastWindow;
} }
void scheduleToastWindowsTimeoutIfNeededLocked(WindowState oldFocus, void scheduleToastWindowsTimeoutIfNeededLocked(WindowState oldFocus,