From 02794193c92af0b5f5e752fb3230790715314bbe Mon Sep 17 00:00:00 2001 From: Steve McKay Date: Tue, 1 Dec 2015 16:20:41 -0800 Subject: [PATCH] Show share button in downloads. Also, rename "ManagerRootActivity" to "DownloadsActivity" since because...well, it is almost always Downloads and is specialized for this case. Bug: 25809806 Change-Id: I496d34393d269d2120c8e214413cb87df8bf171d --- packages/DocumentsUI/AndroidManifest.xml | 2 +- .../{ManageRootActivity.java => DownloadsActivity.java} | 13 ++++++++----- .../src/com/android/documentsui/dirlist/FragmentTuner.java | 1 - 3 files changed, 9 insertions(+), 7 deletions(-) rename packages/DocumentsUI/src/com/android/documentsui/{ManageRootActivity.java => DownloadsActivity.java} (95%) diff --git a/packages/DocumentsUI/AndroidManifest.xml b/packages/DocumentsUI/AndroidManifest.xml index 595928a373f9..60f5d6007ec1 100644 --- a/packages/DocumentsUI/AndroidManifest.xml +++ b/packages/DocumentsUI/AndroidManifest.xml @@ -39,7 +39,7 @@ diff --git a/packages/DocumentsUI/src/com/android/documentsui/ManageRootActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DownloadsActivity.java similarity index 95% rename from packages/DocumentsUI/src/com/android/documentsui/ManageRootActivity.java rename to packages/DocumentsUI/src/com/android/documentsui/DownloadsActivity.java index 3045fa847b26..f224343f1ed7 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/ManageRootActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DownloadsActivity.java @@ -50,8 +50,11 @@ import com.android.internal.util.Preconditions; import java.util.Arrays; import java.util.List; -public class ManageRootActivity extends BaseActivity { - private static final String TAG = "ManageRootsActivity"; +// Let's face it. MANAGE_ROOT is used almost exclusively +// for downloads, and is specialized for this purpose. +// So it is now thusly christened. +public class DownloadsActivity extends BaseActivity { + private static final String TAG = "DownloadsActivity"; private Toolbar mToolbar; private Spinner mToolbarStack; @@ -59,7 +62,7 @@ public class ManageRootActivity extends BaseActivity { private ItemSelectedListener mStackListener; private BaseAdapter mStackAdapter; - public ManageRootActivity() { + public DownloadsActivity() { super(R.layout.manage_roots_activity, TAG); } @@ -250,7 +253,7 @@ public class ManageRootActivity extends BaseActivity { finish(); } - public static ManageRootActivity get(Fragment fragment) { - return (ManageRootActivity) fragment.getActivity(); + public static DownloadsActivity get(Fragment fragment) { + return (DownloadsActivity) fragment.getActivity(); } } diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java index 38d3805ab188..ef6d2c9e42bc 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java @@ -176,7 +176,6 @@ public abstract class FragmentTuner { final MenuItem moveTo = menu.findItem(R.id.menu_move_to); open.setVisible(false); - share.setVisible(false); delete.setVisible(canDelete); copyTo.setVisible(true); copyTo.setEnabled(true); -- 2.11.0