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

Commit b3df8508 authored by Steve McKay's avatar Steve McKay Committed by Android (Google) Code Review
Browse files

Merge "Minor animation cleanup." into nyc-dev

parents 59917dfb 178e4071

packages/DocumentsUI/res/animator-ldrtl/dir_enter.xml

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
<!-- Copyright (C) 2013 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:valueFrom="-1"

    android:valueTo="0"

    android:propertyName="position"

    android:valueType="floatType"

    android:duration="@android:integer/config_mediumAnimTime"

    android:interpolator="@android:interpolator/decelerate_quad" />

packages/DocumentsUI/res/animator-ldrtl/dir_leave.xml

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
<!-- Copyright (C) 2013 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:valueFrom="0"

    android:valueTo="-1"

    android:propertyName="position"

    android:valueType="floatType"

    android:duration="@android:integer/config_mediumAnimTime"

    android:interpolator="@android:interpolator/accelerate_quad" />

packages/DocumentsUI/res/animator/dir_frozen.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<!-- Copyright (C) 2013 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:valueFrom="0"

    android:valueTo="0"

    android:propertyName="position"

    android:valueType="floatType"

    android:duration="@android:integer/config_mediumAnimTime" />

packages/DocumentsUI/src/com/android/documentsui/dirlist/AnimationView.java

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ public class AnimationView extends LinearLayout { 


    public void setPosition(float position) {

        mPosition = position;

        // Warning! If we ever decide to switch this to setX (slide left/right)

        // please remember to add RLT variations of the animations under res/animator-ldrtl.

        setY((mSpan > 0) ? (mPosition * mSpan) : 0);



        if (mPosition != 0) {