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

Merge "Prevent wallpaper be affected by windowing mode." into rvc-dev am: 72a0aa0590 am: dd132dfd55

Browse Source 
Change-Id: I61879171768cf0a6b1548fe5606d89a6841cecf8
This commit is contained in:
Wei Sheng Shih
2020-04-22 07:58:40 +00:00
committed by Automerger Merge Worker
parent 9d3d199ebe dd132dfd55
commit 0f389af3c0
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
package com.android.server.wm; package com.android.server.wm;
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYERS; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYERS;
@@ -45,6 +46,7 @@ class WallpaperWindowToken extends WindowToken {
DisplayContent dc, boolean ownerCanManageAppTokens) { DisplayContent dc, boolean ownerCanManageAppTokens) {
super(service, token, TYPE_WALLPAPER, explicit, dc, ownerCanManageAppTokens); super(service, token, TYPE_WALLPAPER, explicit, dc, ownerCanManageAppTokens);
dc.mWallpaperController.addWallpaperToken(this); dc.mWallpaperController.addWallpaperToken(this);
setWindowingMode(WINDOWING_MODE_FULLSCREEN);
} }
@Override @Override

19
services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java
View File

@@ -16,6 +16,9 @@
package com.android.server.wm; package com.android.server.wm;
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS; import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
@@ -251,6 +254,22 @@ public class WallpaperControllerTests extends WindowTestsBase {
assertEquals(otherWindowInitialZoom, wallpaperWindow.mWallpaperZoomOut, .01f); assertEquals(otherWindowInitialZoom, wallpaperWindow.mWallpaperZoomOut, .01f);
} }
/**
* Tests that the windowing mode of the wallpaper window must always be fullscreen.
*/
@Test
public void testWallpaperTokenWindowingMode() {
final DisplayContent dc = mWm.mRoot.getDefaultDisplay();
final WallpaperWindowToken token = new WallpaperWindowToken(mWm, mock(IBinder.class),
true, dc, true /* ownerCanManageAppTokens */);
// The wallpaper should have requested override fullscreen windowing mode, so the
// configuration (windowing mode) propagation from display won't change it.
dc.setWindowingMode(WINDOWING_MODE_FREEFORM);
assertEquals(WINDOWING_MODE_FULLSCREEN, token.getWindowingMode());
dc.setWindowingMode(WINDOWING_MODE_UNDEFINED);
assertEquals(WINDOWING_MODE_FULLSCREEN, token.getWindowingMode());
}
private WindowState createWallpaperTargetWindow(DisplayContent dc) { private WindowState createWallpaperTargetWindow(DisplayContent dc) {
final ActivityRecord homeActivity = new ActivityTestsBase.ActivityBuilder(mWm.mAtmService) final ActivityRecord homeActivity = new ActivityTestsBase.ActivityBuilder(mWm.mAtmService)