Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches

1 files changed, 1 insertions, 21 deletions

diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java
index 9d229f088..85dc4427e 100644
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -74,8 +74,8 @@ public class MoviePlayer implements
     private static final long RESUMEABLE_TIMEOUT = 3 * 60 * 1000; // 3 mins
 
     private Context mContext;
-    private final VideoView mVideoView;
     private final View mRootView;
+    private final VideoView mVideoView;
     private final Bookmarker mBookmarker;
     private final Uri mUri;
     private final Handler mHandler = new Handler();
@@ -104,14 +104,6 @@ public class MoviePlayer implements
         }
     };
 
-    private final Runnable mRemoveBackground = new Runnable() {
-        @SuppressWarnings("deprecation")
-        @Override
-        public void run() {
-            mRootView.setBackgroundDrawable(null);
-        }
-    };
-
     private final Runnable mProgressChecker = new Runnable() {
         @Override
         public void run() {
@@ -199,19 +191,7 @@ public class MoviePlayer implements
                 if ((diff & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) != 0
                         && (visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0) {
                     mController.show();
-
-                    // We need to set the background to clear ghosting images
-                    // when ActionBar slides in. However, if we keep the background,
-                    // there will be one additional layer in HW composer, which is bad
-                    // to battery. As a solution, we remove the background when we
-                    // hide the action bar
-                    mHandler.removeCallbacks(mRemoveBackground);
                     mRootView.setBackgroundColor(Color.BLACK);
-                } else {
-                    mHandler.removeCallbacks(mRemoveBackground);
-
-                    // Wait for the slide out animation, one second should be enough
-                    mHandler.postDelayed(mRemoveBackground, 1000);
                 }
             }
         });