Cleanup sliding animation between directories.
The shadow is restored + redundant fade removed.
Bug: 26986946
Change-Id: I31dde7d03f60be470e1c5e06dcdce828d3e4eaa0
(cherry picked from commit 3134ddf99d4215041ed749f3b4e682a1910d208e)
diff --git a/res/layout/directory_cluster.xml b/res/layout/directory_cluster.xml
index 2fa09d3..d84ef08 100644
--- a/res/layout/directory_cluster.xml
+++ b/res/layout/directory_cluster.xml
@@ -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" />
diff --git a/res/layout/fragment_directory.xml b/res/layout/fragment_directory.xml
index e97ced2..d0364ff 100644
--- a/res/layout/fragment_directory.xml
+++ b/res/layout/fragment_directory.xml
@@ -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"
diff --git a/src/com/android/documentsui/dirlist/DirectoryFragment.java b/src/com/android/documentsui/dirlist/DirectoryFragment.java
index 70bee3c..d21b157 100644
--- a/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -876,17 +876,8 @@
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() {