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

This commit is contained in:
Rob Carr
2016-04-21 19:52:01 +00:00
committed by Android (Google) Code Review

View File

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