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

Commit 2af574d8 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Tweaks to lights out animation."

parents 0e60f530 9c911ef2

packages/SystemUI/res/anim/hydraulic_brake_interpolator.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* //device/apps/common/res/anim/ease_out_interpolator.xml

**

** Copyright 2007, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License"); 

** you may not use this file except in compliance with the License. 

** You may obtain a copy of the License at 

**

**     http://www.apache.org/licenses/LICENSE-2.0 

**

** Unless required by applicable law or agreed to in writing, software 

** distributed under the License is distributed on an "AS IS" BASIS, 

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

** See the License for the specific language governing permissions and 

** limitations under the License.

*/

-->



<decelerateInterpolator 

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

    android:factor="10.0" />

packages/SystemUI/res/anim/lights_out_in.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ 
    >

    <translate android:fromYDelta="100%p" android:toYDelta="0"

        android:duration="@android:integer/config_mediumAnimTime" 

        android:interpolator="@anim/hydraulic_brake_interpolator"

        />

    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"

        android:duration="@android:integer/config_mediumAnimTime" 

        android:duration="@android:integer/config_longAnimTime" 

        />

</set>

packages/SystemUI/res/anim/lights_out_out.xml

+3 −2
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ 
    >

    <translate android:toYDelta="100%p" android:fromYDelta="0" 

        android:duration="@android:integer/config_mediumAnimTime" 

        android:interpolator="@anim/hydraulic_brake_interpolator"

        />

    <alpha android:toAlpha="0.1" android:fromAlpha="1.0"

        android:duration="@android:integer/config_mediumAnimTime" 

    <alpha android:toAlpha="0.0" android:fromAlpha="1.0"

        android:duration="@android:integer/config_longAnimTime" 

        />

</set>

packages/SystemUI/res/anim/status_bar_in.xml

+3 −2
Original line number Diff line number Diff line
@@ -17,9 +17,10 @@ 
<set xmlns:android="http://schemas.android.com/apk/res/android"

    >

    <translate android:fromYDelta="-100%p" android:toYDelta="0"

        android:duration="@android:integer/config_mediumAnimTime" 

        android:duration="@android:integer/config_longAnimTime" 

        android:interpolator="@anim/hydraulic_brake_interpolator"

        />

    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"

        android:duration="@android:integer/config_mediumAnimTime" 

        android:duration="@android:integer/config_longAnimTime" 

        />

</set>

packages/SystemUI/res/anim/status_bar_out.xml

+3 −2
Original line number Diff line number Diff line
@@ -17,9 +17,10 @@ 
<set xmlns:android="http://schemas.android.com/apk/res/android"

    >

    <translate android:toYDelta="-100%p" android:fromYDelta="0"

        android:duration="@android:integer/config_mediumAnimTime" 

        android:duration="@android:integer/config_longAnimTime" 

        android:interpolator="@anim/hydraulic_brake_interpolator"

        />

    <alpha android:toAlpha="0.0" android:fromAlpha="1.0"

        android:duration="@android:integer/config_mediumAnimTime" 

        android:duration="@android:integer/config_longAnimTime" 

        />

</set>