Merge "Don't handle key events given to DocHolders of Message type." into nyc-andromeda-dev (b5d5966b) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/FocusManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ public final class FocusManager implements FocusHandler {
		boolean focusChanged = false;
		if (mNavDrawerHasFocus) {
		mDrawer.setOpen(false);
		focusDirectoryList();
		focusChanged = focusDirectoryList();
		} else {
		mDrawer.setOpen(true);
		focusChanged = mRootsFocuser.run();

+12 −4

Original line number	Diff line number	Diff line
		@@ -83,17 +83,25 @@ final class DirectoryAddonsAdapter extends DocumentsAdapter {

		@Override
		public DocumentHolder onCreateViewHolder(ViewGroup parent, int viewType) {
		DocumentHolder holder = null;
		switch (viewType) {
		case ITEM_TYPE_SECTION_BREAK:
		return new TransparentDividerDocumentHolder(mEnv.getContext());
		holder = new TransparentDividerDocumentHolder(mEnv.getContext());
		mEnv.initDocumentHolder(holder);
		break;
		case ITEM_TYPE_HEADER_MESSAGE:
		return new HeaderMessageDocumentHolder(mEnv.getContext(), parent,
		holder = new HeaderMessageDocumentHolder(mEnv.getContext(), parent,
		this::onDismissHeaderMessage);
		mEnv.initDocumentHolder(holder);
		break;
		case ITEM_TYPE_INFLATED_MESSAGE:
		return new InflateMessageDocumentHolder(mEnv.getContext(), parent);
		holder = new InflateMessageDocumentHolder(mEnv.getContext(), parent);
		mEnv.initDocumentHolder(holder);
		break;
		default:
		return mDelegate.createViewHolder(parent, viewType);
		holder = mDelegate.createViewHolder(parent, viewType);
		}
		return holder;
		}

		private void onDismissHeaderMessage() {

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ import com.android.documentsui.R;
		* are more information from the Provider.
		* Used by {@link DirectoryAddonsAdapter}.
		*/
		final class HeaderMessageDocumentHolder extends DocumentHolder {
		final class HeaderMessageDocumentHolder extends MessageHolder {
		private Message mMessage;
		private ImageView mIcon;
		private TextView mTextView;

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ import com.android.documentsui.R;
		* in the directory, whether due to no items, no search results or an error.
		* Used by {@link DirectoryAddonsAdapter}.
		*/
		final class InflateMessageDocumentHolder extends DocumentHolder {
		final class InflateMessageDocumentHolder extends MessageHolder {
		private Message mMessage;
		private TextView mMsgView;
		private ImageView mImageView;

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.documentsui.dirlist;

		import android.content.Context;
		import android.view.ViewGroup;
		import android.widget.Space;

		import com.android.documentsui.base.DocumentInfo;
		import com.android.documentsui.base.Events.InputEvent;

		/**
		* Base class for all non-Document Holder classes.
		*/
		abstract class MessageHolder extends DocumentHolder {
		public MessageHolder(Context context, Space space) {
		super(context, space);
		}

		public MessageHolder(Context context, ViewGroup parent, int layout) {
		super(context, parent, layout);
		}

		@Override
		public boolean isInSelectionHotspot(InputEvent event) {
		return false;
		}

		@Override
		public boolean isInDragHotspot(InputEvent event) {
		return false;
		}
		}
		No newline at end of file