Merge "Rework and clean up DisplayList projection"

diff --cc core/java/android/view/View.java
index 7a97d51,93459d2..7ce2140
--- 1/core/java/android/view/View.java
--- 2/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@@ -2371,22 -2370,6 +2370,16 @@@ public class View implements Drawable.C
       */
      static final int PFLAG3_CALLED_SUPER = 0x10;
  
-      * Flag indicating that the background of this view will be drawn into a
-      * display list and projected onto the closest parent projection surface.
-      */
-     static final int PFLAG3_PROJECT_BACKGROUND = 0x20;
- 
-     /**
 +    /**
 +     * Flag indicating that we're in the process of applying window insets.
 +     */
 +    static final int PFLAG3_APPLYING_INSETS = 0x40;
 +
 +    /**
 +     * Flag indicating that we're in the process of fitting system windows using the old method.
 +     */
 +    static final int PFLAG3_FITTING_SYSTEM_WINDOWS = 0x80;
 +
      /* End of masks for mPrivateFlags3 */
  
      static final int DRAG_MASK = PFLAG2_DRAG_CAN_ACCEPT | PFLAG2_DRAG_HOVERED;

diff --cc libs/hwui/DisplayList.cpp
Simple merge

diff --cc libs/hwui/DisplayList.h
Simple merge