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

Commit bac9cd68 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Put back the status bar animations."

parents c0e74ca8 59aed388
Loading
Loading
Loading
Loading
+0 −13
Original line number Diff line number Diff line
@@ -95,19 +95,6 @@
        <item name="windowExitAnimation">@anim/dialog_exit</item>
    </style>

    <!-- Standard animations for hiding and showing the status bar. -->
    <style name="Animation.StatusBar">
        <item name="windowEnterAnimation">@anim/status_bar_enter</item>
        <item name="windowExitAnimation">@anim/status_bar_exit</item>
    </style>

    <!-- {@hide} -->
    <style name="Animation.StatusBar.IntruderAlert"
        parent="@android:style/Animation.StatusBar">
        <item name="android:windowEnterAnimation">@anim/priority_alert_enter</item>
        <item name="android:windowExitAnimation">@anim/priority_alert_exit</item>
    </style>

    <!-- Standard animations for a translucent window or activity.  This
         style is <em>not<em> used by default for the translucent theme
         (since translucent activities are a special case that have no
+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@
*/
-->

<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@interpolator/decelerate_quad">
<set xmlns:android="http://schemas.android.com/apk/res/android"
        android:interpolator="@android:interpolator/decelerate_quad">
	<translate android:fromYDelta="-75%" android:toYDelta="0"
        android:duration="@android:integer/config_mediumAnimTime"/>
	<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@
*/
-->

<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@interpolator/accelerate_quad">
<set xmlns:android="http://schemas.android.com/apk/res/android"
        android:interpolator="@android:interpolator/accelerate_quad">
	<translate android:fromYDelta="0" android:toYDelta="-75%"
        android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/>
	<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
Loading