Delay calls to setting lights out until after enter animation completes

This will only happen if mScaleAnimation is enabled. Calls to setting lights out causes an animation, which gets janky when it animates concurrently with the scale animation.

Fix for b/8173898

Change-Id: I05f768b9e7d6991930f968d5adb2b91b2efcfb7c

1 files changed, 13 insertions, 1 deletions

diff --git a/appcompat/src/com/android/ex/photo/PhotoViewActivity.java b/appcompat/src/com/android/ex/photo/PhotoViewActivity.java
index 8146b17..455eb88 100644
--- a/appcompat/src/com/android/ex/photo/PhotoViewActivity.java
+++ b/appcompat/src/com/android/ex/photo/PhotoViewActivity.java
@@ -289,7 +289,13 @@ public class PhotoViewActivity extends ActionBarActivity implements
             setActionBarTitles(actionBar);
         }
 
-        setLightsOutMode(mFullScreen);
+        if (!mScaleAnimationEnabled) {
+            setLightsOutMode(mFullScreen);
+        } else {
+            // Keep lights out mode as false. This is to prevent jank cause by concurrent
+            // animations during the enter animation.
+            setLightsOutMode(false);
+        }
     }
 
     @Override
@@ -753,6 +759,7 @@ public class PhotoViewActivity extends ActionBarActivity implements
     public void onEnterAnimationComplete() {
         mEnterAnimationFinished = true;
         mViewPager.setVisibility(View.VISIBLE);
+        setLightsOutMode(mFullScreen);
     }
 
     private void onExitAnimationComplete() {
@@ -1006,6 +1013,11 @@ public class PhotoViewActivity extends ActionBarActivity implements
     }
 
     @Override
+    public boolean isEnterAnimationFinished() {
+        return mEnterAnimationFinished;
+    }
+
+    @Override
     public View getRootView() {
         return mRootView;
     }