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

Commit 472110e7 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Updating the all-apps discovery bounce animation" into ub-launcher3-dorval-polish2

parents f8dcb365 e18d3f53

res/animator-v23/discovery_bounce.xml

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

<!--

/*

** Copyright 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.

*/

-->

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

    android:duration="2166"

    android:repeatCount="5">

    <propertyValuesHolder

        android:propertyName="progress"

        android:valueType="floatType">

        <keyframe

            android:fraction="0"

            android:value="1f" />

        <keyframe

            android:fraction="0.346"

            android:value="1f" />

        <keyframe

            android:fraction=".423"

            android:interpolator="@interpolator/disco_bounce"

            android:value="0.9438f" />

        <keyframe

            android:fraction="0.654"

            android:interpolator="@interpolator/disco_bounce"

            android:value="1f" />

        <keyframe

            android:fraction="1"

            android:value="1f" />

    </propertyValuesHolder>

</objectAnimator>

res/anim/discovery_bounce.xml→res/animator/discovery_bounce.xml

+10 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2016, The Android Open Source Project

** Copyright 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.
@@ -16,30 +16,20 @@ 
** limitations under the License.

*/

-->



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

        android:ordering="sequentially"

        android:startOffset="200">



    android:ordering="sequentially">

    <objectAnimator

        android:duration="166"

        android:interpolator="@interpolator/disco_bounce"

        android:propertyName="progress"

        android:duration="250"

        android:interpolator="@interpolator/disco_bounce_section1"

        android:startOffset="750"

        android:valueFrom="1f"

        android:valueTo=".94f"

        android:valueTo="0.9438f"

        android:valueType="floatType" />

    <objectAnimator

        android:duration="500"

        android:interpolator="@interpolator/disco_bounce"

        android:propertyName="progress"

        android:duration="216"

        android:interpolator="@interpolator/disco_bounce_section2"

        android:valueFrom=".94f"

        android:valueTo="1.012f"

        android:valueType="floatType"/>

    <objectAnimator

        android:propertyName="progress"

        android:duration="234"

        android:interpolator="@interpolator/disco_bounce_section3"

        android:valueFrom="1.012f"

        android:valueTo="1f"

        android:valueType="floatType" />

</set>

res/interpolator/disco_bounce_section1.xml→res/interpolator/disco_bounce.xml

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



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

                  android:controlX1="0.9"

    android:controlX1="0.35"

    android:controlY1="0"

    android:controlX2="0.5"

    android:controlY2="1" />

res/interpolator/disco_bounce_section2.xml

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

<!--

  ~ Copyright (C) 2016 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.9"

                  android:controlY1="0"

                  android:controlX2="0.6"

                  android:controlY2="1"/>

res/interpolator/disco_bounce_section3.xml

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

<!--

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

                  android:controlX2="0.7"

                  android:controlY2="1"/>