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

Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev

Browse Source
This commit is contained in:
Rob Carr
2016-04-21 19:52:01 +00:00
committed by Android (Google) Code Review
parent b53e8a7a8a 13678ee74e
commit 37696cccd8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/view/Window.java
View File

@@ -43,6 +43,8 @@ import android.transition.Transition;
import android.transition.TransitionManager; import android.transition.TransitionManager;
import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityEvent;
import static android.view.WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;
import java.util.List; import java.util.List;
/** /**
@@ -792,8 +794,9 @@ public abstract class Window {
if (wp.packageName == null) { if (wp.packageName == null) {
wp.packageName = mContext.getPackageName(); wp.packageName = mContext.getPackageName();
} }
if (mHardwareAccelerated) { if (mHardwareAccelerated ||
wp.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED; (mWindowAttributes.flags & FLAG_HARDWARE_ACCELERATED) != 0) {
wp.flags |= FLAG_HARDWARE_ACCELERATED;
} }
} }