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

Merge "WM/ViewRootImpl: Fix convertFromTranslucent to respect existing state." into qt-dev

Browse Source 
am: 87b66465b6

Change-Id: I870979a63662f84b07c972dfd17b21a7dd0fccb3
This commit is contained in:
Rob Carr
2019-05-07 12:52:27 -07:00
committed by android-build-merger
parent 0cba51e952 87b66465b6
commit c29d0dcafc
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/view/ViewRootImpl.java
View File

@@ -8271,6 +8271,7 @@ public final class ViewRootImpl implements ViewParent,
void changeCanvasOpacity(boolean opaque) {
Log.d(mTag, "changeCanvasOpacity: opaque=" + opaque);
opaque = opaque & ((mView.mPrivateFlags & View.PFLAG_REQUEST_TRANSPARENT_REGIONS) == 0);
if (mAttachInfo.mThreadedRenderer != null) {
mAttachInfo.mThreadedRenderer.setOpaque(opaque);
}

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

@@ -137,6 +137,7 @@ import android.database.ContentObserver;
import android.graphics.Bitmap;
import android.graphics.Insets;
import android.graphics.Matrix;
import android.graphics.PixelFormat;
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.RectF;
@@ -2604,9 +2605,11 @@ public class WindowManagerService extends IWindowManager.Stub
final AppWindowToken wtoken = mRoot.getAppWindowToken(token);
if (wtoken != null) {
final WindowState win = wtoken.findMainWindow();
if (win != null) {
win.mWinAnimator.setOpaqueLocked(isOpaque);
if (win == null) {
return;
}
isOpaque = isOpaque & !PixelFormat.formatHasAlpha(win.getAttrs().format);
win.mWinAnimator.setOpaqueLocked(isOpaque);
}
}