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

Commit 8ec2d214 authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "Freeze screen while changing expanded desktop mode." into cm-10.2

parents 5b3e2588 c1cef55a

core/java/android/view/WindowManagerPolicy.java

+9 −0
Original line number Diff line number Diff line
@@ -1183,4 +1183,13 @@ public interface WindowManagerPolicy { 
     * @return True if the window is a top level one.

     */

    public boolean isTopLevelWindow(int windowType);



    /**

     * Determine the animation to run for a transition after display

     * metrics changed.

     *

     * @param anim The exiting animation resource id is stored in anim[0], the

     * entering animation resource id is stored in anim[1].

     */

    public void selectDisplayMetricsUpdateAnimationLw(int anim[]);

}

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -1536,6 +1536,8 @@ 
  <java-symbol type="anim" name="rotation_animation_jump_exit" />

  <java-symbol type="anim" name="rotation_animation_xfade_exit" />

  <java-symbol type="anim" name="rotation_animation_enter" />

  <java-symbol type="anim" name="shrink_fade_out_center" />

  <java-symbol type="anim" name="grow_fade_in_center" />

  <java-symbol type="array" name="config_autoBrightnessButtonBacklightValues" />

  <java-symbol type="array" name="config_autoBrightnessKeyboardBacklightValues" />

  <java-symbol type="array" name="config_autoBrightnessLcdBacklightValues" />

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+6 −0
Original line number Diff line number Diff line
@@ -2174,6 +2174,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }

    }



    @Override

    public void selectDisplayMetricsUpdateAnimationLw(int anim[]) {

        anim[0] = R.anim.shrink_fade_out_center;

        anim[1] = R.anim.grow_fade_in_center;

    }



    @Override

    public boolean validateRotationAnimationLw(int exitAnimId, int enterAnimId,

            boolean forceDefault) {

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

+9 −0
Original line number Diff line number Diff line
@@ -9982,6 +9982,15 @@ public class WindowManagerService extends IWindowManager.Stub 
        }



        if (changed) {

            final int[] anim = new int[2];

            if (mAnimator.isDimmingLocked(Display.DEFAULT_DISPLAY)) {

                anim[0] = anim[1] = 0;

            } else {

                mPolicy.selectDisplayMetricsUpdateAnimationLw(anim);

            }



            mWaitingForConfig = true;

            startFreezingDisplayLocked(false, anim[0], anim[1]);

            mH.sendEmptyMessage(H.SEND_NEW_CONFIGURATION);

        }