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

Commit ce55e843 authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Add a config flag to control app transitions"

parents a4447cc1 044e2aef

core/res/res/values/config.xml

+7 −0
Original line number Original line Diff line number Diff line
@@ -2635,4 +2635,11 @@ 




    <!-- An array of packages for which notifications cannot be blocked. -->

    <!-- An array of packages for which notifications cannot be blocked. -->

    <string-array translatable="false" name="config_nonBlockableNotificationPackages" />

    <string-array translatable="false" name="config_nonBlockableNotificationPackages" />



    <!-- The default value for transition animation scale found in developer settings.

         1.0 corresponds to 1x animator scale, 0 means that there will be no transition

         animations. Note that this is only a default and will be overridden by a

         user-set value if toggled by settings so the "Transition animation scale" setting

         should also be hidden if intended to be permanent. -->

    <item name="config_appTransitionAnimationDurationScaleDefault" format="float" type="dimen">1.0</item>

</resources>
 
</resources>

core/res/res/values/symbols.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -2731,4 +2731,6 @@ 
  <!-- Screen-size-dependent modes for picker dialogs. -->

  <!-- Screen-size-dependent modes for picker dialogs. -->

  <java-symbol type="integer" name="time_picker_mode" />

  <java-symbol type="integer" name="time_picker_mode" />

  <java-symbol type="integer" name="date_picker_mode" />

  <java-symbol type="integer" name="date_picker_mode" />



  <java-symbol type="dimen" name="config_appTransitionAnimationDurationScaleDefault" />

</resources>
 
</resources>

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -1033,7 +1033,10 @@ public class WindowManagerService extends IWindowManager.Stub 
        mWindowAnimationScaleSetting = Settings.Global.getFloat(context.getContentResolver(),

        mWindowAnimationScaleSetting = Settings.Global.getFloat(context.getContentResolver(),

                Settings.Global.WINDOW_ANIMATION_SCALE, mWindowAnimationScaleSetting);

                Settings.Global.WINDOW_ANIMATION_SCALE, mWindowAnimationScaleSetting);

        mTransitionAnimationScaleSetting = Settings.Global.getFloat(context.getContentResolver(),

        mTransitionAnimationScaleSetting = Settings.Global.getFloat(context.getContentResolver(),

                Settings.Global.TRANSITION_ANIMATION_SCALE, mTransitionAnimationScaleSetting);

                Settings.Global.TRANSITION_ANIMATION_SCALE,

                context.getResources().getFloat(

                        R.dimen.config_appTransitionAnimationDurationScaleDefault));



        setAnimatorDurationScale(Settings.Global.getFloat(context.getContentResolver(),

        setAnimatorDurationScale(Settings.Global.getFloat(context.getContentResolver(),

                Settings.Global.ANIMATOR_DURATION_SCALE, mAnimatorDurationScaleSetting));

                Settings.Global.ANIMATOR_DURATION_SCALE, mAnimatorDurationScaleSetting));