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

Commit 4a24b57f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Tweak and rename new ease curve"

parents ce01bd90 606c6aba

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1902,6 +1902,7 @@ package android { 
    field public static final int decelerate_cubic = 17563651; // 0x10c0003

    field public static final int decelerate_quad = 17563649; // 0x10c0001

    field public static final int decelerate_quint = 17563653; // 0x10c0005

    field public static final int fast_out_extra_slow_in = 17563674; // 0x10c001a

    field public static final int fast_out_linear_in = 17563663; // 0x10c000f

    field public static final int fast_out_slow_in = 17563661; // 0x10c000d

    field public static final int linear = 17563659; // 0x10c000b

core/res/res/anim/activity_close_exit.xml

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
        android:toTop="95.9%"

        android:toRight="100%"

        android:toBottom="100%"

        android:interpolator="@interpolator/exaggerated_ease"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="425"/>

    <alpha

        android:fromAlpha="1.0"

core/res/res/anim/activity_open_enter.xml

+2 −2
Original line number Diff line number Diff line
@@ -32,6 +32,6 @@ 
        android:toTop="0%"

        android:toRight="100%"

        android:toBottom="100%"

        android:interpolator="@interpolator/exaggerated_ease"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="425"/>

</set>

core/res/res/interpolator/emphasized_deceleration.xml

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

<!--

  ~ Copyright (C) 2017 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

  -->



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

    android:controlX1="0.1"

    android:controlY1="0.8"

    android:controlX2="0.2"

    android:controlY2="1"/>
 
 No newline at end of file

core/res/res/interpolator/exaggerated_ease.xml→core/res/res/interpolator/fast_out_extra_slow_in.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,4 +16,4 @@ 
  -->



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

    android:pathData="M 0,0 C 0.05, 0, 0.133333, 0.08, 0.166666, 0.4 C 0.225, 0.94, 0.25, 1, 1, 1"/>
 
    android:pathData="M 0,0 C 0.05, 0, 0.133333, 0.06, 0.166666, 0.4 C 0.208333, 0.82, 0.25, 1, 1, 1"/>