Merge "Fix contents overlap to top bar" (148604d0) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/BaseActivity.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -387,11 +387,6 @@ public abstract class BaseActivity
		View rootsContainer = findViewById(R.id.container_roots);
		rootsContainer.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom());

		DirectoryFragment fragment = getDirectoryFragment();
		if (fragment != null) {
		fragment.setPreDrawListenerEnabled(true);
		}

		return insets.consumeSystemWindowInsets();
		});

+9 −5

Original line number	Diff line number	Diff line
		@@ -194,10 +194,14 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On
		private final Runnable mOnDisplayStateChanged = this::onDisplayStateChanged;

		private final ViewTreeObserver.OnPreDrawListener mToolbarPreDrawListener = () -> {
		setPreDrawListenerEnabled(false);
		if (mAppBarHeight != getAppBarLayoutHeight()
		\|\| mSaveLayoutHeight != getSaveLayoutHeight()) {
		final boolean appBarHeightChanged = mAppBarHeight != getAppBarLayoutHeight();
		if (appBarHeightChanged \|\| mSaveLayoutHeight != getSaveLayoutHeight()) {
		updateLayout(mState.derivedMode);

		if (appBarHeightChanged) {
		scrollToTop();
		}
		return false;
		}
		return true;
		};
		@@ -255,6 +259,8 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On
		// Make the recycler and the empty views responsive to drop events when allowed.
		mRecView.setOnDragListener(mDragHoverListener);

		setPreDrawListenerEnabled(true);

		return view;
		}

		@@ -1212,8 +1218,6 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On
		mInjector.menuManager.updateOptionMenu();

		mActivity.updateHeaderTitle();

		setPreDrawListenerEnabled(true);
		}
		}
		}