Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11dfb30c authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am f5cfab41: am a59a19ab: Merge "Fix issue #8512015: VideoView\'s window... 

am f5cfab41: am a59a19ab: Merge "Fix issue #8512015: VideoView\'s window animates when its position changes" into jb-mr2-dev

* commit 'f5cfab41':
  Fix issue #8512015: VideoView's window animates when its position changes
parents 689db25e f5cfab41

core/java/android/view/SurfaceView.java

+1 −0
Original line number Diff line number Diff line
@@ -480,6 +480,7 @@ public class SurfaceView extends View { 
                if (!getContext().getResources().getCompatibilityInfo().supportsScreen()) {

                    mLayout.flags |= WindowManager.LayoutParams.FLAG_COMPATIBLE_WINDOW;

                }

                mLayout.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION;



                if (mWindow == null) {

                    Display display = getDisplay();

core/java/android/view/WindowManager.java

+6 −0
Original line number Diff line number Diff line
@@ -1019,6 +1019,12 @@ public interface WindowManager extends ViewManager { 
         * {@hide} */

        public static final int PRIVATE_FLAG_FORCE_SHOW_NAV_BAR = 0x00000020;



        /**

         * Never animate position changes of the window.

         *

         * {@hide} */

        public static final int PRIVATE_FLAG_NO_MOVE_ANIMATION = 0x00000040;



        /**

         * Control flags that are private to the platform.

         * @hide

services/java/com/android/server/wm/WindowState.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.wm; 
import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW;

import static android.view.WindowManager.LayoutParams.FLAG_COMPATIBLE_WINDOW;

import static android.view.WindowManager.LayoutParams.LAST_SUB_WINDOW;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION;

import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;

import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG;

import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD;
@@ -936,6 +937,7 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
        return mContentChanged && !mExiting && !mWinAnimator.mLastHidden && mService.okToDisplay()

                && (mFrame.top != mLastFrame.top

                        || mFrame.left != mLastFrame.left)

                && (mAttrs.privateFlags&PRIVATE_FLAG_NO_MOVE_ANIMATION) == 0

                && (mAttachedWindow == null || !mAttachedWindow.shouldAnimateMove());

    }