diff options
| author | 2018-09-05 21:44:19 +0000 | |
|---|---|---|
| committer | 2018-09-05 21:44:19 +0000 | |
| commit | 900fa92042ba1f1e28280f4df1231b3ede65274d (patch) | |
| tree | e71fd108acd69253db6c3f63984668bb75338341 | |
| parent | d4c227b58461e8ee92f508635f2c35615f468a72 (diff) | |
| parent | 6155aa402a206da7587d966a8d625cf51deb8efd (diff) | |
Merge "Only set FLAG_SCALED for fixed size wallpapers"
| -rw-r--r-- | core/java/android/service/wallpaper/WallpaperService.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index febdb83f0af3..4bd86a44a8ed 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -164,8 +164,7 @@ public abstract class WallpaperService extends Service { int mType; int mCurWidth; int mCurHeight; - int mWindowFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE - | WindowManager.LayoutParams.FLAG_SCALED; + int mWindowFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE; int mWindowPrivateFlags = WindowManager.LayoutParams.PRIVATE_FLAG_WANTS_OFFSET_NOTIFICATIONS; int mCurWindowFlags = mWindowFlags; @@ -776,6 +775,7 @@ public abstract class WallpaperService extends Service { mDisplay.getDisplayInfo(displayInfo); mLayout.width = Math.max(displayInfo.logicalWidth, myWidth); mLayout.height = Math.max(displayInfo.logicalHeight, myHeight); + mWindowFlags |= WindowManager.LayoutParams.FLAG_SCALED; } mLayout.format = mFormat; @@ -785,8 +785,7 @@ public abstract class WallpaperService extends Service { | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN - | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE - | WindowManager.LayoutParams.FLAG_SCALED; + | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; mCurWindowPrivateFlags = mWindowPrivateFlags; mLayout.privateFlags = mWindowPrivateFlags; |