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

Commit 9016506e authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Removed unused animations"

parents d8a905b3 cddef946
Loading
Loading
Loading
Loading
+0 −22
Original line number Diff line number Diff line
<!-- 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.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android" >
    <objectAnimator
        android:duration="500"
        android:propertyXName="translateX"
        android:propertyYName="translateY"
        android:pathData="M 0,0 c 31.33333,0 156.66667,0 188,0 "
        android:interpolator="@android:interpolator/fast_out_slow_in" />
</set>
+0 −30
Original line number Diff line number Diff line
<!-- 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.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android" >
    <set
        android:ordering="sequentially" >
        <objectAnimator
            android:duration="33"
            android:propertyXName="translateX"
            android:propertyYName="translateY"
            android:pathData="M -12,18 L -12,18" />
        <objectAnimator
            android:duration="500"
            android:propertyXName="translateX"
            android:propertyYName="translateY"
            android:pathData="M -12,18 c 31.33333,0 156.66667,0 188,0 "
            android:interpolator="@android:interpolator/fast_out_slow_in" />
    </set>
</set>
+0 −30
Original line number Diff line number Diff line
<!-- 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.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android" >
    <set
        android:ordering="sequentially" >
        <objectAnimator
            android:duration="67"
            android:propertyXName="translateX"
            android:propertyYName="translateY"
            android:pathData="M -24,36 L -24,36" />
        <objectAnimator
            android:duration="500"
            android:propertyXName="translateX"
            android:propertyYName="translateY"
            android:pathData="M -24,36 c 31.33333,0 156.66667,0 188,0 "
            android:interpolator="@android:interpolator/fast_out_slow_in" />
    </set>
</set>
+0 −31
Original line number Diff line number Diff line
<!-- 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.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android" >
    <set
        android:ordering="sequentially" >
        <objectAnimator
            android:duration="150"
            android:propertyName="fillAlpha"
            android:valueFrom="1"
            android:valueTo="1"
            android:interpolator="@android:interpolator/linear" />
        <objectAnimator
            android:duration="100"
            android:propertyName="fillAlpha"
            android:valueFrom="1"
            android:valueTo="0"
            android:interpolator="@android:interpolator/linear" />
    </set>
</set>
+0 −31
Original line number Diff line number Diff line
<!-- 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.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android" >
    <set
        android:ordering="sequentially" >
        <objectAnimator
            android:duration="183"
            android:propertyName="fillAlpha"
            android:valueFrom="1"
            android:valueTo="1"
            android:interpolator="@android:interpolator/linear" />
        <objectAnimator
            android:duration="100"
            android:propertyName="fillAlpha"
            android:valueFrom="1"
            android:valueTo="0"
            android:interpolator="@android:interpolator/linear" />
    </set>
</set>
Loading