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

Commit 18769204 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Add Quantum motion curve interpolators."

parents d374879b 232b0ad8

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -1650,7 +1650,10 @@ 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_linear_in = 17563663; // 0x10c000f

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

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

    field public static final int linear_out_slow_in = 17563662; // 0x10c000e

    field public static final int overshoot = 17563656; // 0x10c0008

  }

























core/res/res/interpolator/fast_out_linear_in.xml
0 → 100644



+22
−0




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>













<!--













  ~ Copyright (C) 2014 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.4"













    android:controlY1="0"













    android:controlX2="1"













    android:controlY2="1"/>
























core/res/res/interpolator/fast_out_slow_in.xml
0 → 100644



+22
−0




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>













<!--













  ~ Copyright (C) 2014 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.4"













    android:controlY1="0"













    android:controlX2="0.2"













    android:controlY2="1"/>
























core/res/res/interpolator/linear_out_slow_in.xml
0 → 100644



+22
−0




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>













<!--













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













    android:controlY1="0"













    android:controlX2="0.2"













    android:controlY2="1"/>
























core/res/res/values/public.xml



+7
−0




























Original line number
Diff line number
Diff line








@@ -2378,4 +2378,11 @@













  <public type="style" name="TextAppearance.Quantum.Button" />































  <public type="style" name="Widget.Holo.Light.Button.Borderless" />



























  <!-- An interpolator which accelerates fast but decelerates slowly. -->













  <public type="interpolator" name="fast_out_slow_in" />













  <!-- An interpolator which starts with a peak non-zero velocity and decelerates slowly. -->













  <public type="interpolator" name="linear_out_slow_in" />













  <!-- An interpolator which accelerates fast and keeps accelerating until the end. -->













  <public type="interpolator" name="fast_out_linear_in" />















</resources>