Move more classes to more specific locations.

Moved .model classes to .base.
Deleted some unused classes.
Moved functional tests into a new .funcitonal package.
Followup to 1450250.

Change-Id: Ic087fe4a014d9179fab3dc6f833aaf73373f9452

3 files changed, 7 insertions, 6 deletions

diff --git a/perf-tests/Android.mk b/perf-tests/Android.mk
index 39a08f741..7cbc5fe3d 100644
--- a/perf-tests/Android.mk
+++ b/perf-tests/Android.mk
@@ -6,9 +6,9 @@ LOCAL_MODULE_TAGS := tests
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
     $(call all-java-files-under, ../tests/src/com/android/documentsui/bots) \
-    ../tests/src/com/android/documentsui/ActivityTest.java \
     ../tests/src/com/android/documentsui/DocumentsProviderHelper.java \
-    ../tests/src/com/android/documentsui/StubProvider.java
+    ../tests/src/com/android/documentsui/StubProvider.java \
+    ../tests/src/com/android/documentsui/functional/ActivityTest.java
 
 LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner
 LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator ub-janktesthelper espresso-core
diff --git a/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java b/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java
index a4a4a8694..05c7c95be 100644
--- a/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java
+++ b/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java
@@ -28,8 +28,9 @@ import android.test.suitebuilder.annotation.LargeTest;
 import android.util.Log;
 import android.view.KeyEvent;
 
-import com.android.documentsui.model.RootInfo;
 import com.android.documentsui.EventListener;
+import com.android.documentsui.base.RootInfo;
+import com.android.documentsui.functional.ActivityTest;
 import com.android.documentsui.manager.ManageActivity;
 
 import java.util.ArrayList;
diff --git a/perf-tests/src/com/android/documentsui/FilesJankPerfTest.java b/perf-tests/src/com/android/documentsui/FilesJankPerfTest.java
index 84d23f7d7..0d1d143d2 100644
--- a/perf-tests/src/com/android/documentsui/FilesJankPerfTest.java
+++ b/perf-tests/src/com/android/documentsui/FilesJankPerfTest.java
@@ -33,7 +33,7 @@ import android.support.test.jank.GfxMonitor;
 import android.support.test.uiautomator.UiScrollable;
 import android.util.Log;
 
-import com.android.documentsui.bots.RootsListBot;
+import com.android.documentsui.bots.SidebarBot;
 import com.android.documentsui.manager.ManageActivity;
 import com.android.documentsui.bots.DirectoryListBot;
 
@@ -43,14 +43,14 @@ public class FilesJankPerfTest extends JankTestBase {
     private static final int MAX_FLINGS = 10;
     private static final int BOT_TIMEOUT = 5000;
 
-    private RootsListBot mRootsListBot;
+    private SidebarBot mRootsListBot;
     private DirectoryListBot mDirListBot;
     private Activity mActivity = null;
 
     public void setUpInLoop() {
         final UiDevice device = UiDevice.getInstance(getInstrumentation());
         final Context context = getInstrumentation().getTargetContext();
-        mRootsListBot = new RootsListBot(device, context, BOT_TIMEOUT);
+        mRootsListBot = new SidebarBot(device, context, BOT_TIMEOUT);
         mDirListBot = new DirectoryListBot(device, context, BOT_TIMEOUT);
 
         final Intent intent = new Intent(context, ManageActivity.class);