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

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

Merge "More snazzy animation for UX happiness." into nyc-dev

parents d969cc68 0ba38369

packages/DocumentsUI/res/animator/dir_enter.xml

+20 −7
Original line number Diff line number Diff line
@@ -13,10 +13,23 @@ 
     limitations under the License.

-->



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

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

    android:ordering="together">



    <objectAnimator

        android:valueFrom="0f"

        android:valueTo="1f"

        android:propertyName="alpha"

        android:valueType="floatType"

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

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



    <objectAnimator

        android:propertyName="position"

        android:valueFrom="1"

        android:valueTo="0"

    android:propertyName="position"

        android:valueType="floatType"

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

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



</set>

packages/DocumentsUI/res/animator/dir_leave.xml

+20 −7
Original line number Diff line number Diff line
@@ -13,10 +13,23 @@ 
     limitations under the License.

-->



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

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

    android:ordering="together">



    <objectAnimator

        android:valueFrom="1f"

        android:valueTo="0f"

        android:propertyName="alpha"

        android:valueType="floatType"

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

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



    <objectAnimator

        android:valueFrom="0"

        android:valueTo="1"

        android:propertyName="position"

        android:valueType="floatType"

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

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



</set>
 
 No newline at end of file

packages/DocumentsUI/res/animator/fade_in.xml

0 → 100644
+22 −0
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="0f"

    android:valueTo="1f"

    android:propertyName="alpha"

    android:valueType="floatType"

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

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

packages/DocumentsUI/res/animator/fade_out.xml

0 → 100644
+22 −0
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="1f"

    android:valueTo="0f"

    android:propertyName="alpha"

    android:valueType="floatType"

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

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

packages/DocumentsUI/src/com/android/documentsui/DirectoryView.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class DirectoryView extends LinearLayout { 


    public void setPosition(float position) {

        mPosition = position;

        setX((mWidth > 0) ? (mPosition * mWidth) : 0);

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



        if (mPosition != 0) {

            setTranslationZ(getResources().getDimensionPixelSize(R.dimen.dir_elevation));