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

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

Merge "Centralize animation related resources." into nyc-dev

parents 52db4141 ce710822

packages/DocumentsUI/res/animator/dir_enter.xml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
        android:duration="@android:integer/config_mediumAnimTime"

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



    <!-- position property maps to AnimationView.setPosition -->

    <objectAnimator

        android:propertyName="position"

        android:valueFrom="1"

packages/DocumentsUI/res/animator/dir_leave.xml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
        android:duration="@android:integer/config_mediumAnimTime"

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



    <!-- position property maps to AnimationView.setPosition -->

    <objectAnimator

        android:valueFrom="0"

        android:valueTo="1"

packages/DocumentsUI/res/layout/fragment_directory.xml

+3 −2
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
     limitations under the License.

-->



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

<com.android.documentsui.dirlist.AnimationView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@color/directory_background"
@@ -99,4 +100,4 @@ 


    </FrameLayout>



</com.android.documentsui.DirectoryView>
 
</com.android.documentsui.dirlist.AnimationView>

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

+5 −8
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ package com.android.documentsui; 


import static com.android.documentsui.Shared.DEBUG;

import static com.android.documentsui.State.MODE_GRID;

import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_ENTER;

import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_LEAVE;

import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE;

import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_SIDE;



import android.app.Activity;

import android.app.Fragment;
@@ -48,6 +44,7 @@ import android.widget.Spinner; 


import com.android.documentsui.SearchViewManager.SearchManagerListener;

import com.android.documentsui.State.ViewMode;

import com.android.documentsui.dirlist.AnimationView;

import com.android.documentsui.dirlist.DirectoryFragment;

import com.android.documentsui.dirlist.Model;

import com.android.documentsui.model.DocumentInfo;
@@ -225,7 +222,7 @@ public abstract class BaseActivity extends Activity 
        // Otherwise we delegate loading data from disk to a task

        // to ensure a responsive ui.

        if (mRoots.isRecentsRoot(root)) {

            refreshCurrentRootAndDirectory(ANIM_NONE);

            refreshCurrentRootAndDirectory(AnimationView.ANIM_NONE);

        } else {

            new PickRootTask(this, root).executeOnExecutor(getExecutorForCurrentDirectory());

        }
@@ -327,7 +324,7 @@ public abstract class BaseActivity extends Activity 
        // previous directory. Especially after opening a root document, pressing

        // back, wouldn't go to the previous root, but close the activity.

        final int anim = (mState.hasLocationChanged() && mState.stack.size() > 1)

                ? ANIM_ENTER : ANIM_NONE;

                ? AnimationView.ANIM_ENTER : AnimationView.ANIM_NONE;

        refreshCurrentRootAndDirectory(anim);

    }
@@ -543,7 +540,7 @@ public abstract class BaseActivity extends Activity 
            // Update the restored stack to ensure we have freshest data

            stack.updateDocuments(getContentResolver());

            mState.setStack(stack);

            refreshCurrentRootAndDirectory(ANIM_SIDE);

            refreshCurrentRootAndDirectory(AnimationView.ANIM_SIDE);



        } catch (FileNotFoundException e) {

            Log.w(mTag, "Failed to restore stack: " + e);
@@ -644,7 +641,7 @@ public abstract class BaseActivity extends Activity 
    private boolean popDir() {

        if (mState.stack.size() > 1) {

            mState.stack.pop();

            refreshCurrentRootAndDirectory(ANIM_LEAVE);

            refreshCurrentRootAndDirectory(AnimationView.ANIM_LEAVE);

            return true;

        }

        return false;

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

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static com.android.documentsui.State.ACTION_GET_CONTENT; 
import static com.android.documentsui.State.ACTION_OPEN;

import static com.android.documentsui.State.ACTION_OPEN_TREE;

import static com.android.documentsui.State.ACTION_PICK_COPY_DESTINATION;

import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE;



import android.app.Activity;

import android.app.Fragment;
@@ -46,6 +45,7 @@ import android.view.MenuItem; 


import com.android.documentsui.RecentsProvider.RecentColumns;

import com.android.documentsui.RecentsProvider.ResumeColumns;

import com.android.documentsui.dirlist.AnimationView;

import com.android.documentsui.dirlist.DirectoryFragment;

import com.android.documentsui.dirlist.Model;

import com.android.documentsui.model.DocumentInfo;
@@ -492,7 +492,7 @@ public class DocumentsActivity extends BaseActivity { 
        protected void finish(Void result) {

            mState.restored = true;

            mState.external = mExternal;

            mOwner.refreshCurrentRootAndDirectory(ANIM_NONE);

            mOwner.refreshCurrentRootAndDirectory(AnimationView.ANIM_NONE);

        }

    }