Merge "Disable hardware acceleration for apps in compatibility mode"

Author: Romain Guy

core/java/android/view/ViewRootImpl.java

@@ -425,20 +425,17 @@ public void setView(View view, WindowManager.LayoutParams attrs, View panelParen
                     }
                 }
 
-                // If the application owns the surface, don't enable hardware acceleration
-                if (mSurfaceHolder == null) {
-                    enableHardwareAcceleration(attrs);
-                }
-
                 CompatibilityInfo compatibilityInfo = mCompatibilityInfo.get();
                 mTranslator = compatibilityInfo.getTranslator();
 
-                if (mTranslator != null) {
-                    mSurface.setCompatibilityTranslator(mTranslator);
+                // If the application owns the surface, don't enable hardware acceleration
+                if (mSurfaceHolder == null) {
+                    enableHardwareAcceleration(attrs);
                 }
 
                 boolean restore = false;
                 if (mTranslator != null) {
+                    mSurface.setCompatibilityTranslator(mTranslator);
                     restore = true;
                     attrs.backup();
                     mTranslator.translateWindowLayout(attrs);
@@ -590,6 +587,9 @@ private void enableHardwareAcceleration(WindowManager.LayoutParams attrs) {
         mAttachInfo.mHardwareAccelerated = false;
         mAttachInfo.mHardwareAccelerationRequested = false;
 
+        // Don't enable hardware acceleration when the application is in compatibility mode
+        if (mTranslator != null) return;
+
         // Try to enable hardware acceleration if requested
         final boolean hardwareAccelerated = 
                 (attrs.flags & WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED) != 0;