Show briefcase icon on work files when cross profile is supported.
Bug: 149771764
Test: manual
Test: atest DocumentsUIGoogleTests:com.android.documentsui.dirlist.IconHelperTest
Change-Id: I695d9cb54cfc73f063aba977add48d3d6e270ae9
diff --git a/res/drawable/ic_briefcase.xml b/res/drawable/ic_briefcase.xml
new file mode 100644
index 0000000..cf979ac
--- /dev/null
+++ b/res/drawable/ic_briefcase.xml
@@ -0,0 +1,25 @@
+<!--
+ ~ Copyright (C) 2020 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.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="@color/briefcase_icon_color"
+ android:pathData="M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -1.99,0.89 -1.99,2L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM14,6h-4L10,4h4v2z"/>
+</vector>
diff --git a/res/drawable/ic_briefcase_white.xml b/res/drawable/ic_briefcase_white.xml
new file mode 100644
index 0000000..da3b6be
--- /dev/null
+++ b/res/drawable/ic_briefcase_white.xml
@@ -0,0 +1,25 @@
+<!--
+ ~ Copyright (C) 2020 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.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -1.99,0.89 -1.99,2L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM14,6h-4L10,4h4v2z"/>
+</vector>
diff --git a/res/layout-sw720dp/item_doc_list.xml b/res/layout-sw720dp/item_doc_list.xml
index d269154..827cfed 100644
--- a/res/layout-sw720dp/item_doc_list.xml
+++ b/res/layout-sw720dp/item_doc_list.xml
@@ -76,17 +76,32 @@
android:layout_weight="1"
android:orientation="horizontal" >
- <TextView
- android:id="@android:id/title"
+ <LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginEnd="12dp"
android:layout_weight="0.4"
- android:ellipsize="middle"
- android:singleLine="true"
- android:textAlignment="viewStart"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorPrimary" />
+ android:layout_marginEnd="12dp"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/icon_briefcase"
+ android:layout_height="@dimen/briefcase_icon_size"
+ android:layout_width="@dimen/briefcase_icon_size"
+ android:layout_marginEnd="@dimen/briefcase_icon_margin"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/ic_briefcase"
+ android:contentDescription="@null"/>
+
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="middle"
+ android:singleLine="true"
+ android:textAlignment="viewStart"
+ android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+ android:textColor="?android:attr/textColorPrimary"/>
+ </LinearLayout>
<TextView
android:id="@+id/file_type"
diff --git a/res/layout/item_dir_grid.xml b/res/layout/item_dir_grid.xml
index 06948f6..a0e6578 100644
--- a/res/layout/item_dir_grid.xml
+++ b/res/layout/item_dir_grid.xml
@@ -78,6 +78,14 @@
</FrameLayout>
+ <ImageView
+ android:id="@+id/icon_briefcase"
+ android:layout_height="@dimen/briefcase_icon_size"
+ android:layout_width="@dimen/briefcase_icon_size"
+ android:layout_marginEnd="@dimen/briefcase_icon_margin"
+ android:src="@drawable/ic_briefcase"
+ android:contentDescription="@null"/>
+
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
diff --git a/res/layout/item_doc_grid.xml b/res/layout/item_doc_grid.xml
index d8f6eaf..b3d544b 100644
--- a/res/layout/item_doc_grid.xml
+++ b/res/layout/item_doc_grid.xml
@@ -142,12 +142,23 @@
android:paddingTop="8dp"
android:paddingEnd="12dp">
+ <ImageView
+ android:id="@+id/icon_briefcase"
+ android:layout_height="@dimen/briefcase_icon_size"
+ android:layout_width="@dimen/briefcase_icon_size"
+ android:layout_marginEnd="@dimen/briefcase_icon_margin"
+ android:layout_alignTop="@android:id/title"
+ android:layout_alignBottom="@android:id/title"
+ android:gravity="center_vertical"
+ android:src="@drawable/ic_briefcase"
+ android:contentDescription="@null"/>
+
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
- android:layout_alignParentStart="true"
+ android:layout_toEndOf="@+id/icon_briefcase"
android:singleLine="true"
android:ellipsize="end"
android:textAlignment="viewStart"
diff --git a/res/layout/item_doc_list.xml b/res/layout/item_doc_list.xml
index c485edb..8e73b7f 100644
--- a/res/layout/item_doc_list.xml
+++ b/res/layout/item_doc_list.xml
@@ -77,15 +77,29 @@
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/list_item_padding" >
- <TextView
- android:id="@android:id/title"
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="0dp"
- android:layout_weight="1"
- android:ellipsize="end"
- android:singleLine="true"
- android:textAlignment="viewStart"
- android:textAppearance="?android:attr/textAppearanceListItem" />
+ android:layout_weight="1">
+
+ <ImageView
+ android:id="@+id/icon_briefcase"
+ android:layout_height="@dimen/briefcase_icon_size"
+ android:layout_width="@dimen/briefcase_icon_size"
+ android:layout_marginEnd="@dimen/briefcase_icon_margin"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/ic_briefcase"
+ android:contentDescription="@null"/>
+
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:textAlignment="viewStart"
+ android:textAppearance="?android:attr/textAppearanceListItem"/>
+ </LinearLayout>
<LinearLayout
android:id="@+id/line2"
diff --git a/res/layout/item_photo_grid.xml b/res/layout/item_photo_grid.xml
index a1ceea0..cc2e86a 100644
--- a/res/layout/item_photo_grid.xml
+++ b/res/layout/item_photo_grid.xml
@@ -103,6 +103,25 @@
</FrameLayout>
+ <FrameLayout
+ android:id="@+id/icon_briefcase"
+ android:layout_width="@dimen/button_touch_size"
+ android:layout_height="@dimen/button_touch_size"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentEnd="true"
+ android:pointerIcon="hand">
+
+ <ImageView
+ android:layout_height="@dimen/briefcase_icon_size_photo"
+ android:layout_width="@dimen/briefcase_icon_size_photo"
+ android:src="@drawable/ic_briefcase_white"
+ android:padding="5dp"
+ android:background="@drawable/circle_button_background"
+ android:layout_gravity="center"
+ android:scaleType="fitCenter"
+ android:contentDescription="@null"/>
+ </FrameLayout>
+
<!-- An overlay that draws the item border when it is focused. -->
<View
android:layout_width="wrap_content"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a34f09d..af5201a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -41,4 +41,6 @@
<color name="app_icon_background">#ff4688f2</color>
<color name="shortcut_foreground">#ff3367d6</color>
<color name="shortcut_background">#fff5f5f5</color>
+
+ <color name="briefcase_icon_color">#1A73E8</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 67afcbb..ee62ace 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -51,6 +51,9 @@
<dimen name="grid_item_elevation">2dp</dimen>
<dimen name="grid_item_radius">2dp</dimen>
<dimen name="max_drawer_width">280dp</dimen>
+ <dimen name="briefcase_icon_margin">8dp</dimen>
+ <dimen name="briefcase_icon_size">14dp</dimen>
+ <dimen name="briefcase_icon_size_photo">24dp</dimen>
<dimen name="drawer_edge_width">12dp</dimen>
diff --git a/src/com/android/documentsui/dirlist/DocumentHolder.java b/src/com/android/documentsui/dirlist/DocumentHolder.java
index 263c586..7962f7f 100644
--- a/src/com/android/documentsui/dirlist/DocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/DocumentHolder.java
@@ -107,6 +107,8 @@
public void bindPreviewIcon(boolean show, Function<View, Boolean> clickCallback) {}
+ public void bindBriefcaseIcon(boolean show) {}
+
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
assert(mKeyEventListener != null);
diff --git a/src/com/android/documentsui/dirlist/GridDirectoryHolder.java b/src/com/android/documentsui/dirlist/GridDirectoryHolder.java
index e32a48b..930773b 100644
--- a/src/com/android/documentsui/dirlist/GridDirectoryHolder.java
+++ b/src/com/android/documentsui/dirlist/GridDirectoryHolder.java
@@ -39,6 +39,7 @@
private final ImageView mIconCheck;
private final ImageView mIconMime;
+ private final ImageView mIconBriefcase;
private final View mIconLayout;
public GridDirectoryHolder(Context context, ViewGroup parent) {
@@ -48,6 +49,7 @@
mTitle = (TextView) itemView.findViewById(android.R.id.title);
mIconMime = (ImageView) itemView.findViewById(R.id.icon_mime_sm);
mIconCheck = (ImageView) itemView.findViewById(R.id.icon_check);
+ mIconBriefcase = (ImageView) itemView.findViewById(R.id.icon_briefcase);
mIconMime.setImageDrawable(
IconUtils.loadMimeIcon(context, DocumentsContract.Document.MIME_TYPE_DIR));
}
@@ -67,6 +69,11 @@
}
@Override
+ public void bindBriefcaseIcon(boolean show) {
+ mIconBriefcase.setVisibility(show ? View.VISIBLE : View.GONE);
+ }
+
+ @Override
public boolean inDragRegion(MotionEvent event) {
// Entire grid box should be draggable
return true;
diff --git a/src/com/android/documentsui/dirlist/GridDocumentHolder.java b/src/com/android/documentsui/dirlist/GridDocumentHolder.java
index dbc665a..b7bf1e9 100644
--- a/src/com/android/documentsui/dirlist/GridDocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/GridDocumentHolder.java
@@ -48,6 +48,7 @@
final ImageView mIconMimeSm;
final ImageView mIconThumb;
final ImageView mIconCheck;
+ final ImageView mIconBriefcase;
final IconHelper mIconHelper;
final View mIconLayout;
final View mPreviewIcon;
@@ -66,6 +67,7 @@
mIconMimeSm = (ImageView) itemView.findViewById(R.id.icon_mime_sm);
mIconThumb = (ImageView) itemView.findViewById(R.id.icon_thumb);
mIconCheck = (ImageView) itemView.findViewById(R.id.icon_check);
+ mIconBriefcase = (ImageView) itemView.findViewById(R.id.icon_briefcase);
mPreviewIcon = itemView.findViewById(R.id.preview_icon);
mIconHelper = iconHelper;
@@ -121,6 +123,11 @@
}
@Override
+ public void bindBriefcaseIcon(boolean show) {
+ mIconBriefcase.setVisibility(show ? View.VISIBLE : View.GONE);
+ }
+
+ @Override
public boolean inDragRegion(MotionEvent event) {
// Entire grid box should be draggable
return true;
diff --git a/src/com/android/documentsui/dirlist/GridPhotoHolder.java b/src/com/android/documentsui/dirlist/GridPhotoHolder.java
index 2389087..22e8041 100644
--- a/src/com/android/documentsui/dirlist/GridPhotoHolder.java
+++ b/src/com/android/documentsui/dirlist/GridPhotoHolder.java
@@ -45,6 +45,7 @@
private final ImageView mIconCheck;
private final IconHelper mIconHelper;
private final View mPreviewIcon;
+ private final View mIconBriefcase;
// This is used in as a convenience in our bind method.
private final DocumentInfo mDoc = new DocumentInfo();
@@ -55,6 +56,7 @@
mIconMimeLg = (ImageView) itemView.findViewById(R.id.icon_mime_lg);
mIconThumb = (ImageView) itemView.findViewById(R.id.icon_thumb);
mIconCheck = (ImageView) itemView.findViewById(R.id.icon_check);
+ mIconBriefcase = itemView.findViewById(R.id.icon_briefcase);
mPreviewIcon = itemView.findViewById(R.id.preview_icon);
mIconHelper = iconHelper;
@@ -102,6 +104,11 @@
}
@Override
+ public void bindBriefcaseIcon(boolean show) {
+ mIconBriefcase.setVisibility(show ? View.VISIBLE : View.GONE);
+ }
+
+ @Override
public boolean inDragRegion(MotionEvent event) {
// Entire grid box should be draggable
return true;
diff --git a/src/com/android/documentsui/dirlist/IconHelper.java b/src/com/android/documentsui/dirlist/IconHelper.java
index 77e5e9c..e2c9905 100644
--- a/src/com/android/documentsui/dirlist/IconHelper.java
+++ b/src/com/android/documentsui/dirlist/IconHelper.java
@@ -32,6 +32,7 @@
import android.widget.ImageView;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import com.android.documentsui.DocumentsApplication;
import com.android.documentsui.IconUtils;
@@ -63,15 +64,25 @@
private Point mCurrentSize;
private boolean mThumbnailsEnabled = true;
private final boolean mMaybeShowBadge;
+ @Nullable
+ private final UserId mManagedUser;
/**
* @param context
* @param mode MODE_GRID or MODE_LIST
*/
public IconHelper(Context context, int mode, boolean maybeShowBadge) {
+ this(context, mode, maybeShowBadge, DocumentsApplication.getThumbnailCache(context),
+ DocumentsApplication.getUserIdManager(context).getManagedUser());
+ }
+
+ @VisibleForTesting
+ IconHelper(Context context, int mode, boolean maybeShowBadge, ThumbnailCache thumbnailCache,
+ @Nullable UserId managedUser) {
mContext = context;
setViewMode(mode);
- mThumbnailCache = DocumentsApplication.getThumbnailCache(context);
+ mThumbnailCache = thumbnailCache;
+ mManagedUser = managedUser;
mMaybeShowBadge = maybeShowBadge;
}
@@ -248,4 +259,12 @@
return getDocumentIcon(
context, doc.userId, doc.authority, doc.documentId, doc.mimeType, doc.icon);
}
+
+ /**
+ * Returns true if we should show a briefcase icon for the given user.
+ */
+ public boolean shouldShowBadge(int userIdIdentifier) {
+ return mMaybeShowBadge && mManagedUser != null
+ && mManagedUser.getIdentifier() == userIdIdentifier;
+ }
}
diff --git a/src/com/android/documentsui/dirlist/ListDocumentHolder.java b/src/com/android/documentsui/dirlist/ListDocumentHolder.java
index 71b590c..f4ec86b 100644
--- a/src/com/android/documentsui/dirlist/ListDocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/ListDocumentHolder.java
@@ -53,6 +53,7 @@
private final ImageView mIconMime;
private final ImageView mIconThumb;
private final ImageView mIconCheck;
+ private final ImageView mIconBriefcase;
private final View mIconLayout;
final View mPreviewIcon;
@@ -69,6 +70,7 @@
mIconMime = (ImageView) itemView.findViewById(R.id.icon_mime);
mIconThumb = (ImageView) itemView.findViewById(R.id.icon_thumb);
mIconCheck = (ImageView) itemView.findViewById(R.id.icon_check);
+ mIconBriefcase = (ImageView) itemView.findViewById(R.id.icon_briefcase);
mTitle = (TextView) itemView.findViewById(android.R.id.title);
mSize = (TextView) itemView.findViewById(R.id.size);
mDate = (TextView) itemView.findViewById(R.id.date);
@@ -136,6 +138,11 @@
}
@Override
+ public void bindBriefcaseIcon(boolean show) {
+ mIconBriefcase.setVisibility(show ? View.VISIBLE : View.GONE);
+ }
+
+ @Override
public boolean inDragRegion(MotionEvent event) {
// If itemView is activated = selected, then whole region is interactive
if (itemView.isActivated()) {
diff --git a/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java b/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java
index 4bb362c..f763607 100644
--- a/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java
+++ b/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapter.java
@@ -34,6 +34,7 @@
import com.android.documentsui.base.EventListener;
import com.android.documentsui.base.Lookup;
import com.android.documentsui.base.State;
+import com.android.documentsui.roots.RootCursorWrapper;
import java.util.ArrayList;
import java.util.List;
@@ -130,6 +131,7 @@
final String docMimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
final int docFlags = getCursorInt(cursor, Document.COLUMN_FLAGS);
+ final int userIdIdentifier = getCursorInt(cursor, RootCursorWrapper.COLUMN_USER_ID);
boolean enabled = mEnv.isDocumentEnabled(docMimeType, docFlags);
boolean selected = mEnv.isSelected(modelId);
@@ -141,6 +143,7 @@
holder.setAction(mEnv.getDisplayState().action);
holder.bindPreviewIcon(mEnv.getDisplayState().shouldShowPreview() && enabled,
view -> mEnv.getActionHandler().previewItem(holder.getItemDetails()));
+ holder.bindBriefcaseIcon(mIconHelper.shouldShowBadge(userIdIdentifier));
mEnv.onBindDocumentHolder(holder, cursor);
}
diff --git a/tests/unit/com/android/documentsui/dirlist/IconHelperTest.java b/tests/unit/com/android/documentsui/dirlist/IconHelperTest.java
new file mode 100644
index 0000000..d2419e8
--- /dev/null
+++ b/tests/unit/com/android/documentsui/dirlist/IconHelperTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2020 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 static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.UserHandle;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.documentsui.ThumbnailCache;
+import com.android.documentsui.base.State;
+import com.android.documentsui.base.UserId;
+
+import org.junit.Before;
+import org.junit.Test;
+
+@SmallTest
+public final class IconHelperTest {
+
+ private Context mContext;
+ private IconHelper mIconHelper;
+ private ThumbnailCache mThumbnailCache = new ThumbnailCache(1000);
+
+ private UserId systemUser = UserId.of(UserHandle.SYSTEM);
+ private UserId managedUser = UserId.of(100);
+
+ @Before
+ public void setUp() {
+ mContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+ mIconHelper = new IconHelper(mContext, State.MODE_LIST, /* maybeShowBadge= */ true,
+ mThumbnailCache, managedUser);
+ }
+
+ @Test
+ public void testShouldShowBadge_returnFalse_onSystemUser() {
+ assertThat(mIconHelper.shouldShowBadge(systemUser.getIdentifier())).isFalse();
+ }
+
+ @Test
+ public void testShouldShowBadge_returnTrue_onManagedUser() {
+ assertThat(mIconHelper.shouldShowBadge(managedUser.getIdentifier())).isTrue();
+ }
+
+ @Test
+ public void testShouldShowBadge_returnFalse_onManagedUser_doNotShowBadge() {
+ mIconHelper = new IconHelper(mContext, State.MODE_LIST, /* maybeShowBadge= */ false,
+ mThumbnailCache, managedUser);
+ assertThat(mIconHelper.shouldShowBadge(managedUser.getIdentifier())).isFalse();
+ }
+
+ @Test
+ public void testShouldShowBadge_returnFalse_onManagedUser_withoutManagedUser() {
+ mIconHelper = new IconHelper(mContext, State.MODE_LIST, /* maybeShowBadge= */ true,
+ mThumbnailCache, /* managedUser= */ null);
+ assertThat(mIconHelper.shouldShowBadge(managedUser.getIdentifier())).isFalse();
+ }
+}
