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

Commit 58adc765 authored by Darrell Shi's avatar Darrell Shi
Browse files

Change dream IN animation duration to 250ms. 

This change adds a framework level config for dream IN/OUT animation
durations that is shared by the animation xml and keyguard view mediator
to ensure wherever the dream is launched, it has a consistent launch
animation duration.

The dream IN duration has been changed to 250ms from previously 1000ms
to match specs.

Bug: 222507937
Test: observe dream IN animation over launcher
Test: observe dream IN animation over keyguard
Change-Id: I5a51406f8476a76131b6c1aeeb89d12bd43a5a17
parent 39413173

core/res/res/anim/dream_activity_close_exit.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,5 +19,5 @@ 
<alpha xmlns:android="http://schemas.android.com/apk/res/android"

<alpha xmlns:android="http://schemas.android.com/apk/res/android"

    android:fromAlpha="1.0"

    android:fromAlpha="1.0"

    android:toAlpha="0.0"

    android:toAlpha="0.0"

    android:duration="100" />

    android:duration="@integer/config_dreamCloseAnimationDuration" />

core/res/res/anim/dream_activity_open_enter.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,5 +22,5 @@ those two has to be the same. --> 
<alpha xmlns:android="http://schemas.android.com/apk/res/android"

<alpha xmlns:android="http://schemas.android.com/apk/res/android"

    android:fromAlpha="0.0"

    android:fromAlpha="0.0"

    android:toAlpha="1.0"

    android:toAlpha="1.0"

    android:duration="1000" />

    android:duration="@integer/config_dreamOpenAnimationDuration" />

core/res/res/anim/dream_activity_open_exit.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,4 +22,4 @@ dream_activity_open_enter animation. --> 
<alpha xmlns:android="http://schemas.android.com/apk/res/android"

<alpha xmlns:android="http://schemas.android.com/apk/res/android"

    android:fromAlpha="1.0"

    android:fromAlpha="1.0"

    android:toAlpha="1.0"

    android:toAlpha="1.0"

    android:duration="1000" />
 
    android:duration="@integer/config_dreamOpenAnimationDuration" />

core/res/res/values/config.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -2482,6 +2482,11 @@ 
    <!-- Whether dreams are disabled when ambient mode is suppressed. -->

    <!-- Whether dreams are disabled when ambient mode is suppressed. -->

    <bool name="config_dreamsDisabledByAmbientModeSuppressionConfig">false</bool>

    <bool name="config_dreamsDisabledByAmbientModeSuppressionConfig">false</bool>





    <!-- The duration in milliseconds of the dream opening animation.  -->

    <integer name="config_dreamOpenAnimationDuration">250</integer>

    <!-- The duration in milliseconds of the dream closing animation.  -->

    <integer name="config_dreamCloseAnimationDuration">100</integer>



    <!-- Whether to dismiss the active dream when an activity is started. Doesn't apply to

    <!-- Whether to dismiss the active dream when an activity is started. Doesn't apply to

         assistant activities (ACTIVITY_TYPE_ASSISTANT) -->

         assistant activities (ACTIVITY_TYPE_ASSISTANT) -->

    <bool name="config_dismissDreamOnActivityStart">false</bool>

    <bool name="config_dismissDreamOnActivityStart">false</bool>

core/res/res/values/symbols.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -2237,6 +2237,8 @@ 
  <java-symbol type="string" name="config_dreamsDefaultComponent" />

  <java-symbol type="string" name="config_dreamsDefaultComponent" />

  <java-symbol type="bool" name="config_dreamsDisabledByAmbientModeSuppressionConfig" />

  <java-symbol type="bool" name="config_dreamsDisabledByAmbientModeSuppressionConfig" />

  <java-symbol type="bool" name="config_dreamsOnlyEnabledForSystemUser" />

  <java-symbol type="bool" name="config_dreamsOnlyEnabledForSystemUser" />

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

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

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

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

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

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

  <java-symbol type="bool" name="config_dismissDreamOnActivityStart" />

  <java-symbol type="bool" name="config_dismissDreamOnActivityStart" />