Merge "Auto open/close drawer as drag shadow enters/exits the drawer." into nyc-andromeda-dev (c9628f4c) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/DrawerController.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -153,20 +153,19 @@ public abstract class DrawerController implements DrawerListener {

		@Override
		public void setDropTargetHighlight(View v, boolean highlight) {
		assert (v.getId() == R.id.drawer_edge);

		@ColorRes int id = highlight ? R.color.item_doc_background_selected :
		android.R.color.transparent;
		v.setBackgroundColor(id);
		}

		@Override
		public void onViewHovered(View v) {
		public void onDragEntered(View v) {
		assert (v.getId() == R.id.drawer_edge);

		setOpen(true);
		}

		@Override
		public void onViewHovered(View v) {
		}

		@Override
		public void setOpen(boolean open) {
		setOpen(open, OPENED_OTHER);

+5 −0

Original line number	Diff line number	Diff line
		@@ -125,6 +125,11 @@ public final class HorizontalBreadcrumb extends RecyclerView
		}
		}

		@Override
		public void onDragEntered(View v) {
		// do nothing
		}

		@Override
		public void onViewHovered(View v) {
		int pos = getChildAdapterPosition(v);

+8 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ public class ItemDragListener<H extends DragHost> implements OnDragListener {
		private static final String TAG = "ItemDragListener";

		@VisibleForTesting
		static final int SPRING_TIMEOUT = 1000;
		static final int SPRING_TIMEOUT = 1500;

		protected final H mDragHost;
		private final Timer mHoverTimer;
		@@ -78,6 +78,7 @@ public class ItemDragListener<H extends DragHost> implements OnDragListener {
		}

		private void handleEnteredEvent(View v, DragEvent event) {
		mDragHost.onDragEntered(v);
		@Nullable TimerTask task = createOpenTask(v, event);
		if (task == null) {
		return;
		@@ -162,5 +163,11 @@ public class ItemDragListener<H extends DragHost> implements OnDragListener {
		* @param v the view being hovered
		*/
		void onViewHovered(View v);

		/**
		* Notifies right away when drag shadow enters the view
		* @param v the view which drop shadow just entered
		*/
		void onDragEntered(View v);
		}
		}

+11 −1

Original line number	Diff line number	Diff line
		@@ -1027,6 +1027,16 @@ public class DirectoryFragment extends Fragment
		getActivity().runOnUiThread(runnable);
		}

		/**
		* {@inheritDoc}
		*
		* In DirectoryFragment, we close the roots drawer right away.
		*/
		@Override
		public void onDragEntered(View view) {
		getBaseActivity().setRootsDrawerOpen(false);
		}

		/**
		* {@inheritDoc}
		*
		@@ -1034,7 +1044,7 @@ public class DirectoryFragment extends Fragment
		*/
		@Override
		public void onViewHovered(View view) {
		BaseActivity activity = (BaseActivity) getActivity();
		BaseActivity activity = getBaseActivity();
		if (getModelId(view) != null) {
		activity.springOpenDirectory(getDestination(view));
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -359,6 +359,15 @@ public class RootsFragment extends Fragment implements ItemDragListener.DragHost
		getActivity().runOnUiThread(runnable);
		}

		/**
		* {@inheritDoc}
		*
		* In RootsFragment we don't do anything
		*/
		@Override
		public void onDragEntered(View v) {
		}

		/**
		* {@inheritDoc}
		*