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

Commit c418b531 authored by Selim Cinek's avatar Selim Cinek Committed by Android Git Automerger
Browse files

am 7dc85603: am 087c96f8: am 04675730: Merge "Improved the dismiss all animation" into lmp-mr1-dev 

* commit '7dc85603':
  Improved the dismiss all animation
parents 73875c7d 7dc85603

packages/SystemUI/res/anim/dismiss_all_shape_animation_1.xml

0 → 100644
+22 −0
Original line number Original line 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>

packages/SystemUI/res/anim/dismiss_all_shape_animation_2.xml

0 → 100644
+30 −0
Original line number Original line 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>

packages/SystemUI/res/anim/dismiss_all_shape_animation_3.xml

0 → 100644
+30 −0
Original line number Original line 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>

packages/SystemUI/res/anim/dismiss_all_shape_animation_rectangle_path_1.xml

0 → 100644
+31 −0
Original line number Original line 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>

packages/SystemUI/res/anim/dismiss_all_shape_animation_rectangle_path_1_1.xml

0 → 100644
+31 −0
Original line number Original line 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>