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

Merge "Request a wallpaper update pass when wallpaper target is set to visible" into nyc-dev

Browse Source
This commit is contained in:
Chong Zhang
2016-04-26 23:29:38 +00:00
committed by Android (Google) Code Review
parent 83c4135a3a 4d7369adb3
commit b60a830f8b
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/AppWindowToken.java
View File

@@ -515,6 +515,13 @@ class AppWindowToken extends WindowToken {
} }
} }
void requestUpdateWallpaperIfNeeded() {
for (int i = allAppWindows.size() - 1; i >= 0; i--) {
final WindowState w = allAppWindows.get(i);
w.requestUpdateWallpaperIfNeeded();
}
}
boolean isRelaunching() { boolean isRelaunching() {
return mPendingRelaunchCount > 0; return mPendingRelaunchCount > 0;
} }

2
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -4426,6 +4426,8 @@ public class WindowManagerService extends IWindowManager.Stub
wtoken.sendAppVisibilityToClients(); wtoken.sendAppVisibilityToClients();
} }
} }
wtoken.requestUpdateWallpaperIfNeeded();
if (DEBUG_ADD_REMOVE) Slog.v( if (DEBUG_ADD_REMOVE) Slog.v(
TAG_WM, "No longer Stopped: " + wtoken); TAG_WM, "No longer Stopped: " + wtoken);
wtoken.mAppStopped = false; wtoken.mAppStopped = false;

10
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -73,6 +73,7 @@ import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL; import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
import static android.view.WindowManager.LayoutParams.FLAG_SCALED; import static android.view.WindowManager.LayoutParams.FLAG_SCALED;
import static android.view.WindowManager.LayoutParams.FLAG_SECURE; import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED; import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
import static android.view.WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON; import static android.view.WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON;
import static android.view.WindowManager.LayoutParams.LAST_SUB_WINDOW; import static android.view.WindowManager.LayoutParams.LAST_SUB_WINDOW;
@@ -90,6 +91,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;
import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD; import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;
import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG; import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG;
import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER;
import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;
import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_DOCKED_DIVIDER; import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_DOCKED_DIVIDER;
import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_FREEFORM; import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_FREEFORM;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE;
@@ -2719,6 +2721,14 @@ final class WindowState implements WindowManagerPolicy.WindowState {
mAnimateReplacingWindow = false; mAnimateReplacingWindow = false;
} }
void requestUpdateWallpaperIfNeeded() {
if (mDisplayContent != null && (mAttrs.flags & FLAG_SHOW_WALLPAPER) != 0) {
mDisplayContent.pendingLayoutChanges |= FINISH_LAYOUT_REDO_WALLPAPER;
mDisplayContent.layoutNeeded = true;
mService.mWindowPlacerLocked.requestTraversal();
}
}
float translateToWindowX(float x) { float translateToWindowX(float x) {
float winX = x - mFrame.left; float winX = x - mFrame.left;
if (mEnforceSizeCompat) { if (mEnforceSizeCompat) {