manager/ManageActivity back to files/FilesActivity.

The "mange" rename resulted in a disturbance in the force.

Change-Id: I0f057ba7621912f173e47a472bfc6e23a5a6d54a

30 files changed, 75 insertions, 73 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f6d89d247..9ea7b54b9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -43,7 +43,7 @@
         </activity>
 
         <activity
-            android:name=".manager.LauncherActivity"
+            android:name=".files.LauncherActivity"
             android:label="@string/downloads_label"
             android:icon="@drawable/files_icon"
             android:theme="@android:style/Theme.NoDisplay">
@@ -52,7 +52,7 @@
         <!--  Preserve original launcher activity from Nougat. -->
         <activity-alias
             android:name=".Launcher"
-            android:targetActivity=".manager.LauncherActivity"
+            android:targetActivity=".files.LauncherActivity"
             android:label="@string/downloads_label"
             android:icon="@drawable/files_icon" >
             <intent-filter>
@@ -62,7 +62,7 @@
         </activity-alias>
 
         <activity
-            android:name=".manager.ManageActivity"
+            android:name=".files.FilesActivity"
             android:label="@string/downloads_label"
             android:icon="@drawable/files_icon"
             android:documentLaunchMode="intoExisting"
diff --git a/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java b/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java
index ee0c9299c..33ef73e5e 100644
--- a/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java
+++ b/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java
@@ -28,8 +28,8 @@ import android.test.suitebuilder.annotation.LargeTest;
 
 import com.android.documentsui.BaseActivity.EventListener;
 import com.android.documentsui.base.RootInfo;
+import com.android.documentsui.files.FilesActivity;
 import com.android.documentsui.ActivityTest;
-import com.android.documentsui.manager.ManageActivity;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -37,7 +37,7 @@ import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
 @LargeTest
-public class FilesActivityPerfTest extends ActivityTest<ManageActivity> {
+public class FilesActivityPerfTest extends ActivityTest<FilesActivity> {
 
     // Constants starting with KEY_ are used to report metrics to APCT.
     private static final String KEY_FILES_LISTED_PERFORMANCE_FIRST =
@@ -52,7 +52,7 @@ public class FilesActivityPerfTest extends ActivityTest<ManageActivity> {
     private static final int NUM_MEASUREMENTS = 10;
 
     public FilesActivityPerfTest() {
-        super(ManageActivity.class);
+        super(FilesActivity.class);
     }
 
     @Override
diff --git a/perf-tests/src/com/android/documentsui/FilesJankPerfTest.java b/perf-tests/src/com/android/documentsui/FilesJankPerfTest.java
index 43c42dbdf..04dfc7882 100644
--- a/perf-tests/src/com/android/documentsui/FilesJankPerfTest.java
+++ b/perf-tests/src/com/android/documentsui/FilesJankPerfTest.java
@@ -35,7 +35,7 @@ import android.support.test.uiautomator.UiScrollable;
 import android.util.Log;
 
 import com.android.documentsui.bots.SidebarBot;
-import com.android.documentsui.manager.ManageActivity;
+import com.android.documentsui.files.FilesActivity;
 import com.android.documentsui.bots.DirectoryListBot;
 
 @LargeTest
@@ -55,7 +55,7 @@ public class FilesJankPerfTest extends JankTestBase {
         mRootsListBot = new SidebarBot(device, context, BOT_TIMEOUT);
         mDirListBot = new DirectoryListBot(device, automation, context, BOT_TIMEOUT);
 
-        final Intent intent = new Intent(context, ManageActivity.class);
+        final Intent intent = new Intent(context, FilesActivity.class);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         mActivity = getInstrumentation().startActivitySync(intent);
         try {
diff --git a/src/com/android/documentsui/AbstractActionHandler.java b/src/com/android/documentsui/AbstractActionHandler.java
index ec1597b79..81463d8ba 100644
--- a/src/com/android/documentsui/AbstractActionHandler.java
+++ b/src/com/android/documentsui/AbstractActionHandler.java
@@ -36,7 +36,7 @@ import com.android.documentsui.dirlist.AnimationView.AnimationType;
 import com.android.documentsui.dirlist.DocumentDetails;
 import com.android.documentsui.dirlist.Model;
 import com.android.documentsui.dirlist.MultiSelectManager.Selection;
-import com.android.documentsui.manager.LauncherActivity;
+import com.android.documentsui.files.LauncherActivity;
 import com.android.documentsui.roots.LoadRootTask;
 import com.android.documentsui.roots.RootsAccess;
 import com.android.documentsui.sidebar.EjectRootTask;
diff --git a/src/com/android/documentsui/Metrics.java b/src/com/android/documentsui/Metrics.java
index 62b92b0ad..52d348d83 100644
--- a/src/com/android/documentsui/Metrics.java
+++ b/src/com/android/documentsui/Metrics.java
@@ -34,7 +34,7 @@ import com.android.documentsui.base.DocumentInfo;
 import com.android.documentsui.base.RootInfo;
 import com.android.documentsui.base.State;
 import com.android.documentsui.base.State.ActionType;
-import com.android.documentsui.manager.LauncherActivity;
+import com.android.documentsui.files.LauncherActivity;
 import com.android.documentsui.services.FileOperationService;
 import com.android.documentsui.services.FileOperationService.OpType;
 import com.android.internal.logging.MetricsLogger;
diff --git a/src/com/android/documentsui/manager/ActionHandler.java b/src/com/android/documentsui/files/ActionHandler.java
index 0041a5efa..d6c4f4276 100644
--- a/src/com/android/documentsui/manager/ActionHandler.java
+++ b/src/com/android/documentsui/files/ActionHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.manager;
+package com.android.documentsui.files;
 
 import static com.android.documentsui.base.Shared.DEBUG;
 
@@ -46,7 +46,7 @@ import com.android.documentsui.dirlist.FragmentTuner;
 import com.android.documentsui.dirlist.Model;
 import com.android.documentsui.dirlist.MultiSelectManager;
 import com.android.documentsui.dirlist.MultiSelectManager.Selection;
-import com.android.documentsui.manager.ActionHandler.Addons;
+import com.android.documentsui.files.ActionHandler.Addons;
 import com.android.documentsui.roots.RootsAccess;
 import com.android.documentsui.services.FileOperation;
 import com.android.documentsui.services.FileOperationService;
@@ -60,7 +60,7 @@ import java.util.concurrent.Executor;
 import javax.annotation.Nullable;
 
 /**
- * Provides {@link ManageActivity} action specializations to fragments.
+ * Provides {@link FilesActivity} action specializations to fragments.
  */
 public class ActionHandler<T extends Activity & Addons> extends AbstractActionHandler<T> {
 
diff --git a/src/com/android/documentsui/manager/ManageActivity.java b/src/com/android/documentsui/files/FilesActivity.java
index 1aea5cf1b..116472a47 100644
--- a/src/com/android/documentsui/manager/ManageActivity.java
+++ b/src/com/android/documentsui/files/FilesActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.manager;
+package com.android.documentsui.files;
 
 import static com.android.documentsui.OperationDialogFragment.DIALOG_TYPE_UNKNOWN;
 import static com.android.documentsui.base.Shared.DEBUG;
@@ -38,7 +38,6 @@ import com.android.documentsui.BaseActivity;
 import com.android.documentsui.DocumentsApplication;
 import com.android.documentsui.FocusManager;
 import com.android.documentsui.MenuManager.DirectoryDetails;
-import com.android.documentsui.ProviderExecutor;
 import com.android.documentsui.OperationDialogFragment;
 import com.android.documentsui.OperationDialogFragment.DialogType;
 import com.android.documentsui.ProviderExecutor;
@@ -49,7 +48,6 @@ import com.android.documentsui.base.RootInfo;
 import com.android.documentsui.base.Shared;
 import com.android.documentsui.base.State;
 import com.android.documentsui.clipping.DocumentClipper;
-import com.android.documentsui.dirlist.AnimationView;
 import com.android.documentsui.dirlist.AnimationView.AnimationType;
 import com.android.documentsui.dirlist.DirectoryFragment;
 import com.android.documentsui.dirlist.FragmentTuner;
@@ -67,18 +65,18 @@ import java.util.List;
 /**
  * Standalone file management activity.
  */
-public class ManageActivity extends BaseActivity implements ActionHandler.Addons {
+public class FilesActivity extends BaseActivity implements ActionHandler.Addons {
 
     public static final String TAG = "FilesActivity";
 
     private Tuner mTuner;
     private MenuManager mMenuManager;
     private FocusManager mFocusManager;
-    private ActionHandler<ManageActivity> mActions;
+    private ActionHandler<FilesActivity> mActions;
     private DialogController mDialogs;
     private DocumentClipper mClipper;
 
-    public ManageActivity() {
+    public FilesActivity() {
         super(R.layout.files_activity, TAG);
     }
 
@@ -487,7 +485,7 @@ public class ManageActivity extends BaseActivity implements ActionHandler.Addons
     }
 
     @Override
-    public ActionHandler<ManageActivity> getActionHandler(
+    public ActionHandler<FilesActivity> getActionHandler(
             Model model, MultiSelectManager selectionMgr) {
 
         // provide our friend, RootsFragment, early access to this special feature!
diff --git a/src/com/android/documentsui/manager/LauncherActivity.java b/src/com/android/documentsui/files/LauncherActivity.java
index 8bf3c5cf6..bb25c350f 100644
--- a/src/com/android/documentsui/manager/LauncherActivity.java
+++ b/src/com/android/documentsui/files/LauncherActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.manager;
+package com.android.documentsui.files;
 
 import static com.android.documentsui.base.Shared.DEBUG;
 
@@ -99,7 +99,7 @@ public class LauncherActivity extends Activity {
     }
 
     public static final Intent createLaunchIntent(Activity activity) {
-        Intent intent = new Intent(activity, ManageActivity.class);
+        Intent intent = new Intent(activity, FilesActivity.class);
         intent.setData(buildLaunchUri());
 
         // Relay any config overrides bits present in the original intent.
diff --git a/src/com/android/documentsui/manager/MenuManager.java b/src/com/android/documentsui/files/MenuManager.java
index f898b6db6..f2286f414 100644
--- a/src/com/android/documentsui/manager/MenuManager.java
+++ b/src/com/android/documentsui/files/MenuManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.manager;
+package com.android.documentsui.files;
 
 import android.app.Fragment;
 import android.view.Menu;
diff --git a/src/com/android/documentsui/manager/OpenUriForViewTask.java b/src/com/android/documentsui/files/OpenUriForViewTask.java
index 6fa02f875..f8424c1e7 100644
--- a/src/com/android/documentsui/manager/OpenUriForViewTask.java
+++ b/src/com/android/documentsui/files/OpenUriForViewTask.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.documentsui.manager;
+package com.android.documentsui.files;
 
 import android.app.Activity;
 import android.net.Uri;
@@ -55,7 +55,7 @@ final class OpenUriForViewTask<T extends Activity & CommonAddons>
         final Collection<RootInfo> roots =
                 rootsCache.getRootsForAuthorityBlocking(authority);
         if (roots.isEmpty()) {
-            Log.e(ManageActivity.TAG, "Failed to find root for the requested Uri: " + uri);
+            Log.e(FilesActivity.TAG, "Failed to find root for the requested Uri: " + uri);
             return null;
         }
 
@@ -65,7 +65,7 @@ final class OpenUriForViewTask<T extends Activity & CommonAddons>
         try {
             mState.stack.add(DocumentInfo.fromUri(mOwner.getContentResolver(), uri));
         } catch (FileNotFoundException e) {
-            Log.e(ManageActivity.TAG, "Failed to resolve DocumentInfo from Uri: " + uri);
+            Log.e(FilesActivity.TAG, "Failed to resolve DocumentInfo from Uri: " + uri);
         }
 
         return null;
diff --git a/src/com/android/documentsui/manager/QuickViewIntentBuilder.java b/src/com/android/documentsui/files/QuickViewIntentBuilder.java
index ac53716bc..75bb2c464 100644
--- a/src/com/android/documentsui/manager/QuickViewIntentBuilder.java
+++ b/src/com/android/documentsui/files/QuickViewIntentBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.manager;
+package com.android.documentsui.files;
 
 import static com.android.documentsui.base.DocumentInfo.getCursorString;
 import static com.android.documentsui.base.Shared.DEBUG;
diff --git a/src/com/android/documentsui/manager/Tuner.java b/src/com/android/documentsui/files/Tuner.java
index f783a42e2..d8bb224a7 100644
--- a/src/com/android/documentsui/manager/Tuner.java
+++ b/src/com/android/documentsui/files/Tuner.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.manager;
+package com.android.documentsui.files;
 
 import com.android.documentsui.base.DocumentInfo;
 import com.android.documentsui.base.EventListener;
@@ -30,12 +30,12 @@ import javax.annotation.Nullable;
  */
 public final class Tuner extends FragmentTuner {
 
-    private final ManageActivity mActivity;
+    private final FilesActivity mActivity;
     private final State mState;
 
     private Config mConfig = new Config(this::onModelLoaded);
 
-    public Tuner(ManageActivity activity, State state) {
+    public Tuner(FilesActivity activity, State state) {
 
         assert(activity != null);
         assert(state != null);
diff --git a/src/com/android/documentsui/picker/PickActivity.java b/src/com/android/documentsui/picker/PickActivity.java
index 88837e9bc..1f2f69f02 100644
--- a/src/com/android/documentsui/picker/PickActivity.java
+++ b/src/com/android/documentsui/picker/PickActivity.java
@@ -70,7 +70,7 @@ import java.util.List;
 public class PickActivity extends BaseActivity implements ActionHandler.Addons {
 
     private static final int CODE_FORWARD = 42;
-    private static final String TAG = "DocumentsActivity";
+    private static final String TAG = "PickActivity";
     private Tuner mTuner;
     private FocusManager mFocusManager;
     private MenuManager mMenuManager;
diff --git a/src/com/android/documentsui/services/Job.java b/src/com/android/documentsui/services/Job.java
index f298dbc5e..22f45ff21 100644
--- a/src/com/android/documentsui/services/Job.java
+++ b/src/com/android/documentsui/services/Job.java
@@ -41,7 +41,7 @@ import android.provider.DocumentsContract;
 import android.util.Log;
 
 import com.android.documentsui.clipping.UrisSupplier;
-import com.android.documentsui.manager.ManageActivity;
+import com.android.documentsui.files.FilesActivity;
 import com.android.documentsui.Metrics;
 import com.android.documentsui.OperationDialogFragment;
 import com.android.documentsui.R;
@@ -298,7 +298,7 @@ abstract public class Job implements Runnable {
      * Creates an intent for navigating back to the destination directory.
      */
     Intent buildNavigateIntent(String tag) {
-        Intent intent = new Intent(service, ManageActivity.class);
+        Intent intent = new Intent(service, FilesActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.setAction(DocumentsContract.ACTION_BROWSE);
         intent.setData(getDataUriForIntent(tag));
diff --git a/tests/functional/com/android/documentsui/BandSelectionUiTest.java b/tests/functional/com/android/documentsui/BandSelectionUiTest.java
index 8ea5ad127..61bb4423a 100644
--- a/tests/functional/com/android/documentsui/BandSelectionUiTest.java
+++ b/tests/functional/com/android/documentsui/BandSelectionUiTest.java
@@ -20,13 +20,13 @@ import android.graphics.Point;
 import android.graphics.Rect;
 import android.test.suitebuilder.annotation.LargeTest;
 
-import com.android.documentsui.manager.ManageActivity;
+import com.android.documentsui.files.FilesActivity;
 
 @LargeTest
-public class BandSelectionUiTest extends ActivityTest<ManageActivity> {
+public class BandSelectionUiTest extends ActivityTest<FilesActivity> {
 
     public BandSelectionUiTest() {
-        super(ManageActivity.class);
+        super(FilesActivity.class);
     }
 
     @Override
diff --git a/tests/functional/com/android/documentsui/ContextMenuUiTest.java b/tests/functional/com/android/documentsui/ContextMenuUiTest.java
index 575507852..1dac1533f 100644
--- a/tests/functional/com/android/documentsui/ContextMenuUiTest.java
+++ b/tests/functional/com/android/documentsui/ContextMenuUiTest.java
@@ -22,18 +22,18 @@ import android.net.Uri;
 import android.os.RemoteException;
 import android.support.test.filters.LargeTest;
 
-import com.android.documentsui.manager.ManageActivity;
+import com.android.documentsui.files.FilesActivity;
 
 import java.util.HashMap;
 import java.util.Map;
 
 @LargeTest
-public class ContextMenuUiTest extends ActivityTest<ManageActivity> {
+public class ContextMenuUiTest extends ActivityTest<FilesActivity> {
 
     private Map<String, Boolean> menuItems;
 
     public ContextMenuUiTest() {
-        super(ManageActivity.class);
+        super(FilesActivity.class);
     }
 
     @Override
diff --git a/tests/functional/com/android/documentsui/FileManagementUiTest.java b/tests/functional/com/android/documentsui/FileManagementUiTest.java
index 4d49a70bf..dd186cbad 100644
--- a/tests/functional/com/android/documentsui/FileManagementUiTest.java
+++ b/tests/functional/com/android/documentsui/FileManagementUiTest.java
@@ -26,13 +26,13 @@ import android.test.suitebuilder.annotation.LargeTest;
 import android.view.KeyEvent;
 
 import com.android.documentsui.R;
-import com.android.documentsui.manager.ManageActivity;
+import com.android.documentsui.files.FilesActivity;
 
 @LargeTest
-public class FileManagementUiTest extends ActivityTest<ManageActivity> {
+public class FileManagementUiTest extends ActivityTest<FilesActivity> {
 
     public FileManagementUiTest() {
-        super(ManageActivity.class);
+        super(FilesActivity.class);
     }
 
     @Override
diff --git a/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java b/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java
index 8c0dc164b..8fc6d2712 100644
--- a/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java
+++ b/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java
@@ -25,13 +25,13 @@ import android.test.suitebuilder.annotation.LargeTest;
 
 import com.android.documentsui.base.RootInfo;
 import com.android.documentsui.base.Shared;
-import com.android.documentsui.manager.ManageActivity;
+import com.android.documentsui.files.FilesActivity;
 
 @LargeTest
-public class FilesActivityDefaultsUiTest extends ActivityTest<ManageActivity> {
+public class FilesActivityDefaultsUiTest extends ActivityTest<FilesActivity> {
 
     public FilesActivityDefaultsUiTest() {
-        super(ManageActivity.class);
+        super(FilesActivity.class);
     }
 
     @Override
diff --git a/tests/functional/com/android/documentsui/FilesActivityUiTest.java b/tests/functional/com/android/documentsui/FilesActivityUiTest.java
index 4454e208b..4f0ce13de 100644
--- a/tests/functional/com/android/documentsui/FilesActivityUiTest.java
+++ b/tests/functional/com/android/documentsui/FilesActivityUiTest.java
@@ -20,13 +20,13 @@ import android.net.Uri;
 import android.os.RemoteException;
 import android.test.suitebuilder.annotation.LargeTest;
 
-import com.android.documentsui.manager.ManageActivity;
+import com.android.documentsui.files.FilesActivity;
 
 @LargeTest
-public class FilesActivityUiTest extends ActivityTest<ManageActivity> {
+public class FilesActivityUiTest extends ActivityTest<FilesActivity> {
 
     public FilesActivityUiTest() {
-        super(ManageActivity.class);
+        super(FilesActivity.class);
     }
 
     @Override
diff --git a/tests/functional/com/android/documentsui/GestureSelectionUiTest.java b/tests/functional/com/android/documentsui/GestureSelectionUiTest.java
index 2f01512dc..16c92f33c 100644
--- a/tests/functional/com/android/documentsui/GestureSelectionUiTest.java
+++ b/tests/functional/com/android/documentsui/GestureSelectionUiTest.java
@@ -18,13 +18,13 @@ package com.android.documentsui;
 
 import android.test.suitebuilder.annotation.LargeTest;
 
-import com.android.documentsui.manager.ManageActivity;
+import com.android.documentsui.files.FilesActivity;
 
 @LargeTest
-public class GestureSelectionUiTest extends ActivityTest<ManageActivity> {
+public class GestureSelectionUiTest extends ActivityTest<FilesActivity> {
 
     public GestureSelectionUiTest() {
-        super(ManageActivity.class);
+        super(FilesActivity.class);
     }
 
     @Override
diff --git a/tests/functional/com/android/documentsui/IntegratedDownloadsUiTest.java b/tests/functional/com/android/documentsui/IntegratedDownloadsUiTest.java
index 5462461b8..da340c27d 100644
--- a/tests/functional/com/android/documentsui/IntegratedDownloadsUiTest.java
+++ b/tests/functional/com/android/documentsui/IntegratedDownloadsUiTest.java
@@ -26,14 +26,14 @@ import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.Suppress;
 import android.view.MotionEvent;
 
-import com.android.documentsui.manager.ManageActivity;
+import com.android.documentsui.files.FilesActivity;
 
 // TODO: As of this writing all tests in this class are disabled. Please fix.
 @LargeTest
-public class IntegratedDownloadsUiTest extends ActivityTest<ManageActivity> {
+public class IntegratedDownloadsUiTest extends ActivityTest<FilesActivity> {
 
     public IntegratedDownloadsUiTest() {
-        super(ManageActivity.class);
+        super(FilesActivity.class);
     }
 
     // We don't really need to test the entirety of download support
diff --git a/tests/functional/com/android/documentsui/KeyboardNavigationUiTest.java b/tests/functional/com/android/documentsui/KeyboardNavigationUiTest.java
index c45eaed9a..f70918d48 100644
--- a/tests/functional/com/android/documentsui/KeyboardNavigationUiTest.java
+++ b/tests/functional/com/android/documentsui/KeyboardNavigationUiTest.java
@@ -22,13 +22,13 @@ import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.Suppress;
 import android.view.KeyEvent;
 
-import com.android.documentsui.manager.ManageActivity;
+import com.android.documentsui.files.FilesActivity;
 
 @LargeTest
-public class KeyboardNavigationUiTest extends ActivityTest<ManageActivity> {
+public class KeyboardNavigationUiTest extends ActivityTest<FilesActivity> {
 
     public KeyboardNavigationUiTest() {
-        super(ManageActivity.class);
+        super(FilesActivity.class);
     }
 
     @Override
diff --git a/tests/functional/com/android/documentsui/RenameDocumentUiTest.java b/tests/functional/com/android/documentsui/RenameDocumentUiTest.java
index b70477d69..0330ac302 100644
--- a/tests/functional/com/android/documentsui/RenameDocumentUiTest.java
+++ b/tests/functional/com/android/documentsui/RenameDocumentUiTest.java
@@ -20,15 +20,15 @@ import android.support.test.uiautomator.UiObjectNotFoundException;
 import android.test.suitebuilder.annotation.LargeTest;
 
 import com.android.documentsui.R;
-import com.android.documentsui.manager.ManageActivity;
+import com.android.documentsui.files.FilesActivity;
 
 @LargeTest
-public class RenameDocumentUiTest extends ActivityTest<ManageActivity> {
+public class RenameDocumentUiTest extends ActivityTest<FilesActivity> {
 
     private final String newName = "kitties.log";
 
     public RenameDocumentUiTest() {
-        super(ManageActivity.class);
+        super(FilesActivity.class);
     }
 
     @Override
diff --git a/tests/functional/com/android/documentsui/SearchViewUiTest.java b/tests/functional/com/android/documentsui/SearchViewUiTest.java
index 39c438397..1b248a95b 100644
--- a/tests/functional/com/android/documentsui/SearchViewUiTest.java
+++ b/tests/functional/com/android/documentsui/SearchViewUiTest.java
@@ -23,13 +23,13 @@ import android.support.test.filters.Suppress;
 import android.support.v7.recyclerview.R;
 import android.test.suitebuilder.annotation.LargeTest;
 
-import com.android.documentsui.manager.ManageActivity;
+import com.android.documentsui.files.FilesActivity;
 
 @LargeTest
-public class SearchViewUiTest extends ActivityTest<ManageActivity> {
+public class SearchViewUiTest extends ActivityTest<FilesActivity> {
 
     public SearchViewUiTest() {
-        super(ManageActivity.class);
+        super(FilesActivity.class);
     }
 
     @Override
diff --git a/tests/functional/com/android/documentsui/SidebarUiTest.java b/tests/functional/com/android/documentsui/SidebarUiTest.java
index 48cd902e2..79daceaa3 100644
--- a/tests/functional/com/android/documentsui/SidebarUiTest.java
+++ b/tests/functional/com/android/documentsui/SidebarUiTest.java
@@ -22,15 +22,15 @@ import static com.android.documentsui.StubProvider.ROOT_1_ID;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.Suppress;
 
-import com.android.documentsui.manager.ManageActivity;
+import com.android.documentsui.files.FilesActivity;
 
 @LargeTest
-public class SidebarUiTest extends ActivityTest<ManageActivity> {
+public class SidebarUiTest extends ActivityTest<FilesActivity> {
 
     private static final String TAG = "RootUiTest";
 
     public SidebarUiTest() {
-        super(ManageActivity.class);
+        super(FilesActivity.class);
     }
 
     @Override
diff --git a/tests/functional/com/android/documentsui/SortDocumentUiTest.java b/tests/functional/com/android/documentsui/SortDocumentUiTest.java
index a20292597..5e38d767f 100644
--- a/tests/functional/com/android/documentsui/SortDocumentUiTest.java
+++ b/tests/functional/com/android/documentsui/SortDocumentUiTest.java
@@ -19,12 +19,12 @@ package com.android.documentsui;
 import android.net.Uri;
 import android.support.test.filters.LargeTest;
 
-import com.android.documentsui.manager.ManageActivity;
+import com.android.documentsui.files.FilesActivity;
 import com.android.documentsui.sorting.SortDimension;
 import com.android.documentsui.sorting.SortModel;
 
 @LargeTest
-public class SortDocumentUiTest extends ActivityTest<ManageActivity> {
+public class SortDocumentUiTest extends ActivityTest<FilesActivity> {
 
     private static final String DIR_1 = "folder_1";
     private static final String DIR_2 = "dir_2";
@@ -48,7 +48,7 @@ public class SortDocumentUiTest extends ActivityTest<ManageActivity> {
     private static final String[] FILES_IN_MODIFIED_DESC = reverse(FILES);
 
     public SortDocumentUiTest() {
-        super(ManageActivity.class);
+        super(FilesActivity.class);
     }
 
     @Override
diff --git a/tests/unit/com/android/documentsui/AbstractActionHandlerTest.java b/tests/unit/com/android/documentsui/AbstractActionHandlerTest.java
index 0a04e43bb..ee9ee4dbe 100644
--- a/tests/unit/com/android/documentsui/AbstractActionHandlerTest.java
+++ b/tests/unit/com/android/documentsui/AbstractActionHandlerTest.java
@@ -27,7 +27,7 @@ import com.android.documentsui.base.DocumentStack;
 import com.android.documentsui.base.RootInfo;
 import com.android.documentsui.base.Shared;
 import com.android.documentsui.dirlist.DocumentDetails;
-import com.android.documentsui.manager.LauncherActivity;
+import com.android.documentsui.files.LauncherActivity;
 import com.android.documentsui.testing.Roots;
 import com.android.documentsui.testing.TestEnv;
 
diff --git a/tests/unit/com/android/documentsui/manager/ActionHandlerTest.java b/tests/unit/com/android/documentsui/files/ActionHandlerTest.java
index 250b4731f..aec2f1973 100644
--- a/tests/unit/com/android/documentsui/manager/ActionHandlerTest.java
+++ b/tests/unit/com/android/documentsui/files/ActionHandlerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.manager;
+package com.android.documentsui.files;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -27,6 +27,7 @@ import com.android.documentsui.R;
 import com.android.documentsui.base.RootInfo;
 import com.android.documentsui.base.Shared;
 import com.android.documentsui.dirlist.MultiSelectManager.Selection;
+import com.android.documentsui.files.ActionHandler;
 import com.android.documentsui.testing.TestConfirmationCallback;
 import com.android.documentsui.testing.TestEnv;
 import com.android.documentsui.ui.TestDialogController;
diff --git a/tests/unit/com/android/documentsui/manager/MenuManagerTest.java b/tests/unit/com/android/documentsui/files/MenuManagerTest.java
index cd1c247d1..a7b4fe8c7 100644
--- a/tests/unit/com/android/documentsui/manager/MenuManagerTest.java
+++ b/tests/unit/com/android/documentsui/files/MenuManagerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.manager;
+package com.android.documentsui.files;
 
 import static junit.framework.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -28,6 +28,7 @@ import com.android.documentsui.R;
 import com.android.documentsui.base.DocumentInfo;
 import com.android.documentsui.base.RootInfo;
 import com.android.documentsui.base.State;
+import com.android.documentsui.files.MenuManager;
 import com.android.documentsui.testing.TestDirectoryDetails;
 import com.android.documentsui.testing.TestMenu;
 import com.android.documentsui.testing.TestMenuInflater;
diff --git a/tests/unit/com/android/documentsui/manager/TestActivity.java b/tests/unit/com/android/documentsui/files/TestActivity.java
index 2e0804be0..809830fe0 100644
--- a/tests/unit/com/android/documentsui/manager/TestActivity.java
+++ b/tests/unit/com/android/documentsui/files/TestActivity.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.manager;
+package com.android.documentsui.files;
+
+import com.android.documentsui.files.ActionHandler;
 
 import org.mockito.Mockito;