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

Commit b46e6b99 authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski Committed by Android (Google) Code Review
Browse files

Merge "Cleanup sliding animation between directories."

parents f7bbf1a9 3134ddf9

packages/DocumentsUI/res/layout/directory_cluster.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


    <FrameLayout

        android:id="@+id/container_directory"

        android:clipToPadding="false"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1" />

packages/DocumentsUI/res/layout/fragment_directory.xml

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
<com.android.documentsui.DirectoryView xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@color/window_background"

    android:outlineProvider="bounds"

    android:elevation="4dp"

    android:orientation="vertical">



    <ProgressBar
@@ -81,7 +84,6 @@ 


        <android.support.v7.widget.RecyclerView

            android:id="@+id/list"

            android:background="@color/window_background"

            android:scrollbars="vertical"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

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

+0 −9
Original line number Diff line number Diff line
@@ -876,17 +876,8 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi 
        msgView.setText(msg);

        imageView.setImageResource(drawable);



        content.animate().cancel();  // cancel any ongoing animations



        content.setAlpha(0);

        mEmptyView.setVisibility(View.VISIBLE);

        mRecView.setVisibility(View.GONE);



        // fade in the content, so it looks purdy like

        content.animate()

                .alpha(1f)

                .setDuration(EMPTY_REVEAL_DURATION)

                .setListener(null);

    }



    private void showDirectory() {