Remove missed folder.

Change-Id: I4e8789375423c9a2c16816074c9b39d505cff656
diff --git a/tests/functional/launchertests/Android.mk b/tests/functional/launchertests/Android.mk
deleted file mode 100644
index 56120fe..0000000
--- a/tests/functional/launchertests/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := LauncherFunctionalTests
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator timeresult-helper-lib \
-                               launcher-helper-lib android-support-test \
-                               settings-app-helper \
-
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
diff --git a/tests/functional/launchertests/AndroidManifest.xml b/tests/functional/launchertests/AndroidManifest.xml
deleted file mode 100644
index f48cbfe..0000000
--- a/tests/functional/launchertests/AndroidManifest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.launcher.functional">
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <uses-sdk android:minSdkVersion="19"
-          android:targetSdkVersion="23"/>
-
-    <uses-permission android:name="android.permission.SET_WALLPAPER" />
-    <instrumentation
-            android:name="android.support.test.runner.AndroidJUnitRunner"
-            android:targetPackage="android.launcher.functional"
-            android:label="Platform Android Launcher Functional Tests" />
-</manifest>
diff --git a/tests/functional/launchertests/src/com/android/launcher/functional/HomeScreenTests.java b/tests/functional/launchertests/src/com/android/launcher/functional/HomeScreenTests.java
deleted file mode 100644
index 32653c8..0000000
--- a/tests/functional/launchertests/src/com/android/launcher/functional/HomeScreenTests.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * 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 android.launcher.functional;
-
-import java.io.File;
-import java.io.IOException;
-
-import android.app.UiAutomation;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.Context;
-import android.graphics.Point;
-import android.os.PowerManager;
-import android.os.RemoteException;
-import android.os.SystemClock;
-import android.support.test.launcherhelper.ILauncherStrategy;
-import android.support.test.launcherhelper.LauncherStrategyFactory;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.Direction;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.Until;
-import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.util.Log;
-import android.view.KeyEvent;
-
-public class HomeScreenTests extends InstrumentationTestCase {
-
-    private static final int TIMEOUT = 3000;
-    private static final String HOTSEAT = "hotseat";
-    private UiDevice mDevice;
-    private PackageManager mPackageManager;
-    private ILauncherStrategy mLauncherStrategy = null;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        mPackageManager = getInstrumentation().getContext().getPackageManager();
-        mDevice.setOrientationNatural();
-        mLauncherStrategy = LauncherStrategyFactory.getInstance(mDevice).getLauncherStrategy();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDevice.pressHome();
-        mDevice.unfreezeRotation();
-        mDevice.waitForIdle();
-        super.tearDown();
-    }
-
-    public String getLauncherPackage() {
-        return mDevice.getLauncherPackageName();
-    }
-
-    public void launchAppWithIntent(String appPackageName) {
-        Intent appIntent = mPackageManager.getLaunchIntentForPackage(appPackageName);
-        appIntent.addCategory(Intent.CATEGORY_LAUNCHER);
-        appIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        getInstrumentation().getContext().startActivity(appIntent);
-        SystemClock.sleep(TIMEOUT);
-    }
-
-    @MediumTest
-    public void testGoHome() {
-        launchAppWithIntent("com.android.chrome");
-        mDevice.pressHome();
-        UiObject2 hotseat = mDevice.findObject(By.res(getLauncherPackage(), HOTSEAT));
-        assertNotNull("Hotseat could not be found", hotseat);
-    }
-
-    @MediumTest
-    public void testHomeToRecentsNavigation() throws Exception {
-        mDevice.pressRecentApps();
-        assertNotNull("Recents not found when navigating from hotseat",
-                mDevice.wait(Until.hasObject(By.res("com.android.systemui:id/recents_view")),
-                TIMEOUT));
-    }
-
-    @MediumTest
-    public void testCreateAndDeleteShortcutOnHome() throws Exception {
-        createShortcutOnHome("Calculator");
-        // Verify presence of shortcut on Home screen
-        UiObject2 hotseat = mDevice.findObject(By.res(getLauncherPackage(), HOTSEAT));
-        assertNotNull("Not on Home page; hotseat could not be found", hotseat);
-        UiObject2 calculatorIcon = mDevice.wait(Until.findObject(By.text("Calculator")), TIMEOUT);
-        assertNotNull("Calculator shortcut not found on Home screen", calculatorIcon);
-        removeObjectFromHomeScreen(calculatorIcon, "text", "Calculator");
-    }
-
-    // Screen on with power button press
-    @MediumTest
-    public void testScreenOffOnUsingPowerButton() throws Exception {
-        Context currentContext = getInstrumentation().getContext();
-        PowerManager pm = (PowerManager) currentContext
-                .getSystemService(currentContext.POWER_SERVICE);
-        mDevice.pressKeyCode(KeyEvent.KEYCODE_POWER);
-        Thread.sleep(TIMEOUT);
-        assertFalse("Screen wasn't turned off", pm.isInteractive());
-        mDevice.pressKeyCode(KeyEvent.KEYCODE_POWER);
-        Thread.sleep(TIMEOUT);
-        assertTrue("Screen wasn't turned on by pressing Power Key", pm.isInteractive());
-        // Unlock screen since this ends up putting the device in Swpe lock mode.
-        mDevice.wakeUp();
-        mDevice.pressMenu();
-    }
-
-    // Wallpaper menu from home page
-    @MediumTest
-    public void testLongPressFromHomeToWallpaperMenu() {
-        String wallpaperResourceId = getLauncherPackage() + ":id/wallpaper_image";
-        verifyHomeLongPressMenu("Wallpaper", "wallpaper_button", wallpaperResourceId);
-    }
-
-    // Widget menu from home page
-    @MediumTest
-    public void testLongPressFromHomeToWidgetMenu() {
-        String widgetResourceId = getLauncherPackage() + ":id/widgets_list_view";
-        verifyHomeLongPressMenu("Widgets", "widget_button", widgetResourceId);
-    }
-
-    // Settings menu from home page
-    @MediumTest
-    public void testLongPressFromHomeToGoogleSettingsMenu() {
-         verifyHomeLongPressMenu("Google settings", "settings_button",
-                 "android:id/action_bar");
-     }
-
-    // Home screen long press display menu
-    private void verifyHomeLongPressMenu(String longPressElementName,
-            String longPressElementResourceId, String pageLoadResourceId) {
-        mDevice.pressHome();
-        UiObject2 workspace = mDevice.findObject(By.res(getLauncherPackage(), "workspace"));
-        workspace.longClick();
-        UiObject2 longPressElementButton = mDevice.findObject(By.res(getLauncherPackage(),
-                longPressElementResourceId));
-        assertNotNull(longPressElementName +
-                " element is not visible on long press", longPressElementButton);
-        longPressElementButton.click();
-        mDevice.waitForIdle();
-        assertNotNull(longPressElementName + " page hasn't loaded correctly on clicking",
-                mDevice.wait(Until.hasObject(By.res(pageLoadResourceId)), TIMEOUT));
-    }
-
-    // Home screen add widget
-    @MediumTest
-    public void testAddRemoveWidgetOnHome() throws Exception {
-        mDevice.pressHome();
-        mDevice.waitForIdle();
-        UiObject2 workspace = mDevice.findObject(By.res(getLauncherPackage(), "workspace"));
-        workspace.longClick();
-        UiObject2 widgetButton = mDevice.findObject(By.res(getLauncherPackage(),
-                "widget_button"));
-        widgetButton.click();
-        mDevice.waitForIdle();
-        UiObject2 analogClock = mDevice.wait(Until.findObject(By.text("Analog clock")), TIMEOUT);
-        analogClock.click(2000L);
-
-        // Verify presence of shortcut on Home screen
-        UiObject2 hotseat = mDevice.findObject(By.res(getLauncherPackage(), HOTSEAT));
-        assertNotNull("Not on Home page; hotseat could not be found", hotseat);
-        UiObject2 analogClockWidget = mDevice.findObject
-                (By.res("com.google.android.deskclock:id/analog_appwidget"));
-        assertNotNull("Clock widget not found on Home screen", analogClockWidget);
-        removeObjectFromHomeScreen(analogClockWidget, "res",
-                "com.google.android.deskclock:id/analog_appwidget");
-    }
-
-    @MediumTest
-    public void testCreateRenameRemoveFolderOnHome() throws Exception {
-        // Create two shortcuts on the home screen
-        createShortcutOnHome("Calculator");
-        createShortcutOnHome("Gmail");
-        mDevice.pressHome();
-        mDevice.waitForIdle();
-
-        // Drag and drop the calculator shortcut onto
-        // the clock shortcut to create a folder.
-        UiObject2 calculatorIcon = mDevice.wait
-                (Until.findObject(By.text("Calculator")), TIMEOUT);
-        UiObject2 clockIcon = mDevice.wait
-                (Until.findObject(By.text("Gmail")), TIMEOUT);
-        calculatorIcon.drag(clockIcon.getVisibleCenter(), 1000);
-
-        // Verify that there is a new unnamed folder at this point
-        UiObject2 customFolder = mDevice.wait
-                (Until.findObject(By.desc("Folder: ")), TIMEOUT);
-        customFolder.click();
-        UiObject2 unnamedFolder = mDevice.wait
-                (Until.findObject(By.text("Unnamed Folder")), TIMEOUT);
-        assertNotNull("Custom folder not created", unnamedFolder);
-
-        // Rename the unnamed folder to Snowflake.
-        unnamedFolder.click();
-        unnamedFolder.setText("Snowflake");
-
-        // Dismiss the IME and then collapse the folder.
-        mDevice.pressBack();
-        mDevice.pressBack();
-        mDevice.waitForIdle();
-        UiObject2 workspace = mDevice.findObject(By.res(getLauncherPackage(), "workspace"));
-        workspace.click();
-
-        // Verify the newly renamed Snowflake folder
-        UiObject2 snowflakeFolder = mDevice.wait
-                (Until.findObject(By.text("Snowflake")), TIMEOUT);
-        assertNotNull("Custom folder not created", snowflakeFolder);
-        snowflakeFolder.click();
-        UiObject2 calculatorButton = mDevice.wait
-                (Until.findObject(By.text("Calculator")), TIMEOUT);
-        calculatorButton.click();
-        assertTrue("Calculator wasn't opened from the Google folder",
-                mDevice.wait(Until.hasObject
-                (By.pkg("com.google.android.calculator")), TIMEOUT));
-        mDevice.pressHome();
-        mDevice.waitForIdle();
-
-        // Verify that the Snowflake folder can be removed
-        removeObjectFromHomeScreen(snowflakeFolder, "text", "Snowflake");
-    }
-
-    /* This method takes in an object to be drag/dropped onto the
-     * Remove button hiding behind the search bar
-     *
-     * @param objectToRemove The UI object to be removed from the
-     * Home screen
-     * @param searchCategory String of value text, res or desc, based on which
-     * the By selector is chosen to find the object
-     * @param searchContent String to be searched in the searchCategory
-     */
-    private void removeObjectFromHomeScreen(UiObject2 objectToRemove,
-            String searchCategory, String searchContent) {
-        // Find the center of the Google Search Bar that the Remove button
-        // is hidden behind.
-        // Note: We're using this hacky way of locating the Remove button
-        // because today, UIAutomator doesn't allow us to search for an element
-        // while a touchdown has been executed, but before the touch up.
-        // FYI: A click is a combination of a touch down and a touch up motion.
-        UiObject2 removeButton = null;
-        int removeButtonCenterYCoordinate = 0;
-        String deviceName = mDevice.getProductName();
-        if (deviceName.equals("marlin") || deviceName.equals("sailfish")) {
-            mDevice.wait(Until.findObject(By.res
-                    ("com.google.android.apps.nexuslauncher:id/g_icon")),
-                    TIMEOUT).click();
-            removeButton = mDevice.wait(Until.findObject
-                    (By.res("com.google.android.googlequicksearchbox:id/search_plate")),
-                    TIMEOUT);
-            removeButtonCenterYCoordinate = removeButton.getVisibleCenter().y;
-            // Hit back to go back to the regular Home screen
-            mDevice.pressBack();
-            mDevice.waitForIdle();
-        }
-        else {
-            removeButton = mDevice.wait(Until.findObject(By.desc("Google Search")),
-                    TIMEOUT);
-            removeButtonCenterYCoordinate = removeButton.getVisibleCenter().y;
-        }
-        objectToRemove.drag(new Point(mDevice.getDisplayWidth() / 2,
-                removeButtonCenterYCoordinate), 1000);
-        UiObject2 checkForObject = null;
-        // Refetch the icon
-        if (searchCategory.equals("text")) {
-            checkForObject = mDevice.findObject(By.text(searchContent));
-        }
-        else if (searchCategory.equals("res")) {
-            checkForObject = mDevice.findObject(By.res(searchContent));
-        }
-        else if (searchCategory.equals("desc")) {
-            checkForObject = mDevice.findObject(By.desc(searchContent));
-        }
-        else {
-            Log.d(null, "Your search category doesn't match common use cases.");
-        }
-        assertNull(searchContent + " is present on the Home screen after removal attempt",
-                checkForObject);
-    }
-
-    /* Creates a shortcut for the given app name on the Home screen
-     *
-     * @param appName text of the app name as seen in 'All Apps'
-     */
-    private void createShortcutOnHome(String appName) throws Exception {
-        // Navigate to All Apps
-        mDevice.pressHome();
-        mDevice.findObject(mLauncherStrategy.getAllAppsButtonSelector()).click();
-        mDevice.waitForIdle();
-
-        // Long press on the Calculator app for two seconds and release on home screen
-        // to create a shortcut
-        UiObject2 appIcon =  mDevice.wait(Until.findObject
-                (By.res(getLauncherPackage(), "icon").text(appName)), TIMEOUT);
-        appIcon.click(2000L);
-    }
-}
diff --git a/tests/functional/launchertests/src/com/android/launcher/functional/HotseatHelper.java b/tests/functional/launchertests/src/com/android/launcher/functional/HotseatHelper.java
deleted file mode 100644
index c0b2c51..0000000
--- a/tests/functional/launchertests/src/com/android/launcher/functional/HotseatHelper.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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 android.launcher.functional;
-
-import java.io.IOException;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Environment;
-import android.os.RemoteException;
-import android.os.SystemClock;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.Until;
-
-import junit.framework.Assert;
-
-
-public class HotseatHelper {
-
-    private static final int TIMEOUT = 3000;
-    private UiDevice mDevice;
-    private PackageManager pm;
-    private Context mContext;
-    public static HotseatHelper mInstance = null;
-
-    private HotseatHelper(UiDevice device, Context context) {
-        mDevice = device;
-        mContext = context;
-    }
-
-    public static HotseatHelper getInstance(UiDevice device, Context context) {
-        if (mInstance == null) {
-            mInstance = new HotseatHelper(device, context);
-        }
-        return mInstance;
-    }
-
-    public void launchAppFromHotseat(String textAppName, String appPackage) {
-        mDevice.pressHome();
-        UiObject2 appOnHotseat = mDevice.findObject(By.clazz("android.widget.TextView")
-                .desc(textAppName));
-        Assert.assertNotNull(textAppName + " app couldn't be found on hotseat", appOnHotseat);
-        appOnHotseat.click();
-        UiObject2 appLoaded = mDevice.wait(Until.findObject(By.pkg(appPackage)), TIMEOUT*2);
-        Assert.assertNotNull(textAppName + "app did not load on tapping from hotseat", appLoaded);
-    }
-}
diff --git a/tests/functional/launchertests/src/com/android/launcher/functional/PhoneHotseatTests.java b/tests/functional/launchertests/src/com/android/launcher/functional/PhoneHotseatTests.java
deleted file mode 100644
index ad78fdb..0000000
--- a/tests/functional/launchertests/src/com/android/launcher/functional/PhoneHotseatTests.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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 android.launcher.functional;
-
-import java.io.IOException;
-import android.content.Intent;
-import android.os.RemoteException;
-import android.os.SystemClock;
-import android.support.test.launcherhelper.ILauncherStrategy;
-import android.support.test.launcherhelper.LauncherStrategyFactory;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.Until;
-import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-
-public class PhoneHotseatTests extends InstrumentationTestCase {
-
-    private static final int TIMEOUT = 3000;
-    private static final String HOTSEAT = "hotseat";
-    private UiDevice mDevice;
-    private HotseatHelper hotseatHelper = null;
-    private ILauncherStrategy mLauncherStrategy = null;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        try {
-            mDevice.setOrientationNatural();
-        } catch (RemoteException e) {
-            throw new RuntimeException("failed to freeze device orientaion", e);
-        }
-        mLauncherStrategy = LauncherStrategyFactory.getInstance(mDevice).getLauncherStrategy();
-        hotseatHelper = HotseatHelper.getInstance(mDevice, getInstrumentation().getContext());
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDevice.pressHome();
-        super.tearDown();
-    }
-
-    public String getLauncherPackage() {
-        return mDevice.getLauncherPackageName();
-    }
-
-    @MediumTest
-    public void testOpenPhoneFromHotseat() {
-        hotseatHelper.launchAppFromHotseat("Phone", "com.google.android.dialer");
-    }
-
-    @MediumTest
-    public void testOpenMessengerFromHotseat() {
-        hotseatHelper.launchAppFromHotseat("Messenger", "com.google.android.apps.messaging");
-    }
-
-    @MediumTest
-    public void testOpenChromeFromHotseat() {
-        hotseatHelper.launchAppFromHotseat("Chrome", "com.android.chrome");
-    }
-
-    @MediumTest
-    public void testOpenCameraFromHotseat() {
-        hotseatHelper.launchAppFromHotseat("Camera", "com.google.android.GoogleCamera");
-    }
-
-    @MediumTest
-    public void testHomeToAllAppsNavigation() {
-        mDevice.findObject(mLauncherStrategy.getAllAppsButtonSelector()).click();
-        assertNotNull("All apps page not found when navigating from hotseat",
-                mDevice.wait(Until.hasObject(By.res(getLauncherPackage(), "apps_view")), TIMEOUT));
-    }
-
-}
diff --git a/tests/functional/launchertests/src/com/android/launcher/functional/TabletHotseatTests.java b/tests/functional/launchertests/src/com/android/launcher/functional/TabletHotseatTests.java
deleted file mode 100644
index 7b16a86..0000000
--- a/tests/functional/launchertests/src/com/android/launcher/functional/TabletHotseatTests.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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 android.launcher.functional;
-
-import java.io.IOException;
-import android.content.Intent;
-import android.os.RemoteException;
-import android.os.SystemClock;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.Until;
-import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.Suppress;
-
-public class TabletHotseatTests extends InstrumentationTestCase {
-
-    private static final int TIMEOUT = 3000;
-    private static final String HOTSEAT = "hotseat";
-    private UiDevice mDevice;
-    private HotseatHelper hotseatHelper = null;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        try {
-            mDevice.setOrientationNatural();
-        } catch (RemoteException e) {
-            throw new RuntimeException("failed to freeze device orientaion", e);
-        }
-        hotseatHelper = HotseatHelper.getInstance(mDevice, getInstrumentation().getContext());
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDevice.pressHome();
-        super.tearDown();
-    }
-
-    public String getLauncherPackage() {
-        return mDevice.getLauncherPackageName();
-    }
-
-    @Suppress
-    @MediumTest
-    public void testOpenChromeFromHotseat() {
-        hotseatHelper.launchAppFromHotseat("Chrome", "com.android.chrome");
-    }
-
-    @Suppress
-    @MediumTest
-    public void testOpenCameraFromHotseat() {
-        hotseatHelper.launchAppFromHotseat("Camera", "com.google.android.GoogleCamera");
-    }
-
-    @Suppress
-    @MediumTest
-    public void testOpenGMailFromHotseat() {
-        hotseatHelper.launchAppFromHotseat("Gmail", "com.google.android.gm");
-    }
-
-    @Suppress
-    @MediumTest
-    public void testOpenHangoutsFromHotseat() {
-        hotseatHelper.launchAppFromHotseat("Hangouts", "com.google.android.gms");
-    }
-
-    @Suppress
-    @MediumTest
-    public void testOpenPhotosFromHotseat() {
-        hotseatHelper.launchAppFromHotseat("Photos", "com.google.android.apps.photos");
-    }
-
-    @Suppress
-    @MediumTest
-    public void testOpenYoutubeFromHotseat() {
-        hotseatHelper.launchAppFromHotseat("YouTube", "com.google.android.youtube");
-    }
-
-    @Suppress
-    @MediumTest
-    public void testHomeToAllAppsNavigation() {
-        hotseatHelper.launchAppFromHotseat("Apps", getLauncherPackage());
-        assertNotNull("All apps page not found when navigating from hotseat",
-                mDevice.wait(Until.hasObject(By.res(getLauncherPackage(), "apps_view")), TIMEOUT));
-    }
-}
diff --git a/tests/functional/launchertests/src/com/android/launcher/functional/WallpaperHelper.java b/tests/functional/launchertests/src/com/android/launcher/functional/WallpaperHelper.java
deleted file mode 100644
index 73ebd96..0000000
--- a/tests/functional/launchertests/src/com/android/launcher/functional/WallpaperHelper.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * 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 android.launcher.functional;
-
-import android.app.Instrumentation;
-import android.app.WallpaperManager;
-import android.app.UiAutomation;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.Context;
-import android.graphics.Point;
-import android.os.PowerManager;
-import android.os.RemoteException;
-import android.os.SystemClock;
-import android.support.test.launcherhelper.ILauncherStrategy;
-import android.support.test.launcherhelper.LauncherStrategyFactory;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.Direction;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.Until;
-import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.util.Log;
-import android.view.KeyEvent;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.junit.Assert;
-
-public class WallpaperHelper {
-
-    private static final int TIMEOUT = 3000;
-    private static final int LONG_TIMEOUT = 10000;
-    private static final String WALLPAPER_PACKAGE = "com.google.android.apps.wallpaper";
-    private static final String SET_WALLPAPER = "set_wallpaper";
-    private UiDevice mDevice;
-    private Instrumentation mInstrumentation;
-    private WallpaperManager wallpaperManager;
-
-    public enum WallpaperScreen {
-        HOME, LOCK, BOTH, LIVE
-    }
-
-    public WallpaperHelper(UiDevice device, Instrumentation inst, WallpaperManager wpManager) {
-        this.mDevice = device;
-        mInstrumentation = inst;
-        wallpaperManager = wpManager;
-    }
-
-    public String getLauncherPackage() {
-        return mDevice.getLauncherPackageName();
-    }
-
-    public void launchWallpaperPickerWithIntent() {
-        Intent appIntent = new Intent()
-                .setClassName("com.google.android.apps.wallpaper",
-                        "com.google.android.apps.wallpaper.picker.CategoryPickerActivity")
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mInstrumentation.getContext().startActivity(appIntent);
-        SystemClock.sleep(TIMEOUT);
-    }
-
-    public void setWallpaperFromGivenCategory(String category, String wallpaperName,
-            WallpaperScreen wallpaperScreen) throws Exception {
-        clearAllWallpapers();
-        int[] oldWallpaperIds = returnWallpaperIdsForHomeAndLockScreen();
-        launchWallpaperPickerWithIntent();
-        findAndClickOnObjectInGrid(category, "category_grid");
-        // Pick the wallpaper
-        findAndClickOnObjectInGrid(wallpaperName, "wallpaper_grid");
-        // If live wallpaper, then there's no need to pick Home/Lockscreen
-        // since for security reasons, live wallpaper cannot be set on just
-        // the lockscreen.
-        switch (wallpaperScreen) {
-            case HOME:
-                mDevice.wait(Until.findObject(By.res(WALLPAPER_PACKAGE, SET_WALLPAPER)),
-                        LONG_TIMEOUT).click();
-                mDevice.wait(Until.findObject(By.res(WALLPAPER_PACKAGE,
-                        "set_home_wallpaper_button")), TIMEOUT).click();
-                break;
-            case LOCK:
-                mDevice.wait(Until.findObject(By.res(WALLPAPER_PACKAGE, SET_WALLPAPER)),
-                        LONG_TIMEOUT).click();
-                mDevice.wait(Until.findObject(By.res(WALLPAPER_PACKAGE,
-                        "set_lock_wallpaper_button")), TIMEOUT).click();
-                break;
-            case BOTH:
-                mDevice.wait(Until.findObject(By.res(WALLPAPER_PACKAGE, SET_WALLPAPER)),
-                        LONG_TIMEOUT).click();
-                mDevice.wait(Until.findObject(By.res(WALLPAPER_PACKAGE,
-                        "set_both_wallpaper_button")), TIMEOUT).click();
-                break;
-            // Note: The 'Live' case doesn't show a 'Home' OR 'Home and Lock' dialog box
-            // if both the home and the lockscreen wallpaper are set to the same option.
-            // This is why clearing the wallpaper manager flags at the beginning of
-            // this method is crucial to this option.
-            case LIVE:
-                mDevice.wait(Until.findObject
-                        (By.res("com.android.wallpaper.livepicker:id/set_wallpaper")),
-                        LONG_TIMEOUT).click();
-                break;
-        }
-        mDevice.waitForIdle();
-        Thread.sleep(TIMEOUT);
-        // Assert test is on Home screen
-        UiObject2 homeWorkspace = mDevice.wait(Until.findObject
-                (By.res(getLauncherPackage(), "workspace")), TIMEOUT);
-        Assert.assertNotNull("Test is not on Home screen after setting wallpaper", homeWorkspace);
-        // Assert the wallpaper property
-        int[] newWallpaperIds = returnWallpaperIdsForHomeAndLockScreen();
-        checkIfWallpaperIdChanged(wallpaperScreen, oldWallpaperIds, newWallpaperIds);
-    }
-
-    public int[] returnWallpaperIdsForHomeAndLockScreen() {
-        int[] wallpaperIds = {-1, -1};
-        wallpaperIds[0] = wallpaperManager.getWallpaperId(wallpaperManager.FLAG_SYSTEM);
-        wallpaperIds[1] = wallpaperManager.getWallpaperId(wallpaperManager.FLAG_LOCK);
-        return wallpaperIds;
-    }
-
-    public void checkIfWallpaperIdChanged(WallpaperScreen wallpaperScreen,
-            int[] oldWallpapers, int[] newWallpapers) {
-        switch (wallpaperScreen) {
-            case HOME:
-                Assert.assertNotEquals("Home wallpaper not changed", oldWallpapers[0],
-                        newWallpapers[0]);
-                break;
-            case LOCK:
-                Assert.assertNotEquals("Lockscreen wallpaper not changed", oldWallpapers[1],
-                        newWallpapers[1]);
-                break;
-            // The lockscreen wallpaper is set to -1 when the SYSTEM and LOCKSCREEN wallpaper
-            // are the same. The general wallpaper (FLAG_SYSTEM) applies to both screens in
-            // this case.
-            case BOTH:
-            case LIVE:
-                Assert.assertNotEquals("Home wallpaper not changed", oldWallpapers[0],
-                        newWallpapers[0]);
-                Assert.assertEquals("Lockscreen wallpaper not changed to match System wallpaper",
-                        -1, newWallpapers[1]);
-                break;
-        }
-    }
-
-    public void clearAllWallpapers() throws IOException {
-        wallpaperManager.clear(wallpaperManager.FLAG_SYSTEM);
-        wallpaperManager.clear(wallpaperManager.FLAG_LOCK);
-    }
-
-    public void findAndClickOnObjectInGrid(String objectText, String gridResId)
-            throws IOException {
-        UiObject2 gridObject = mDevice.wait(Until.findObject
-                (By.res(WALLPAPER_PACKAGE, gridResId)), TIMEOUT);
-        UiObject2 wantedObject = null;
-        int scrollCount = 0;
-        // Scroll to the top of the grid object if not already on top
-        while ((scrollCount < 5) && (gridObject != null) &&
-                gridObject.scroll(Direction.UP, 10.0f)) {
-            scrollCount++;
-        }
-        scrollCount = 0;
-        // Tap on specific category
-        while (scrollCount < 8) {
-            if (gridResId == "category_grid" || objectText.contains("IMG_")) {
-                wantedObject = mDevice.wait(Until.findObject(By.textContains(objectText)),
-                        TIMEOUT);
-            }
-            else {
-                wantedObject = mDevice.wait(Until.findObject(By.descContains(objectText)),
-                        TIMEOUT);
-            }
-            if (wantedObject == null) {
-                gridObject.scroll(Direction.DOWN, 0.5f);
-                mDevice.waitForIdle();
-                scrollCount++;
-            }
-            else {
-                break;
-            }
-        }
-        Assert.assertNotNull("The given object " + objectText +
-                " wasn't found in the grid " + gridResId, wantedObject);
-        wantedObject.click();
-        mDevice.waitForIdle();
-    }
-}
diff --git a/tests/functional/launchertests/src/com/android/launcher/functional/WallpaperLargeTests.java b/tests/functional/launchertests/src/com/android/launcher/functional/WallpaperLargeTests.java
deleted file mode 100644
index 36293d4..0000000
--- a/tests/functional/launchertests/src/com/android/launcher/functional/WallpaperLargeTests.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * 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 android.launcher.functional;
-
-import android.app.WallpaperManager;
-import android.app.UiAutomation;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.Context;
-import android.graphics.Point;
-import android.os.PowerManager;
-import android.os.RemoteException;
-import android.os.SystemClock;
-import android.platform.test.helpers.SettingsHelperImpl;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.launcherhelper.ILauncherStrategy;
-import android.support.test.launcherhelper.LauncherStrategyFactory;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.Direction;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.Until;
-import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.util.Log;
-import android.view.KeyEvent;
-
-import junit.framework.TestCase;
-import java.io.File;
-import java.io.IOException;
-
-import org.junit.Assert;
-
-public class WallpaperLargeTests extends TestCase {
-    private static final int TIMEOUT = 3000;
-    private static final String WALLPAPER_PACKAGE = "com.google.android.apps.wallpaper";
-    private UiDevice mDevice;
-    private PackageManager mPackageManager;
-    private ILauncherStrategy mLauncherStrategy = null;
-    private WallpaperManager wallpaperManager;
-    private WallpaperHelper mWallpaperHelper;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        mPackageManager = InstrumentationRegistry
-                .getInstrumentation().getContext().getPackageManager();
-        mDevice.setOrientationNatural();
-        mLauncherStrategy = LauncherStrategyFactory
-                .getInstance(mDevice).getLauncherStrategy();
-        wallpaperManager = WallpaperManager.getInstance
-                 (InstrumentationRegistry.getInstrumentation().getContext());
-        mWallpaperHelper = new WallpaperHelper(mDevice,
-                 InstrumentationRegistry.getInstrumentation(), wallpaperManager);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mWallpaperHelper.clearAllWallpapers();
-        mDevice.pressBack();
-        mDevice.pressBack();
-        mDevice.pressHome();
-        mDevice.unfreezeRotation();
-        mDevice.waitForIdle();
-        super.tearDown();
-    }
-
-    /*
-    @LargeTest
-    public void testSetWallpaperPhoto() throws Exception {
-       // mCameraHelper.goToCameraMode();
-       // mCameraHelper.capturePhoto();
-       // Thread.sleep(LONG_TIMEOUT * 2);
-       mWallpaperHelper.setWallpaperFromGivenCategory("My photos",
-                 "IMG_", WallpaperHelper.WallpaperScreen.BOTH);
-    }
-    */
-
-    @LargeTest
-    public void testSetWallpaperLandscape() throws Exception {
-       mWallpaperHelper.setWallpaperFromGivenCategory("Landscape",
-                 "Photo by ", WallpaperHelper.WallpaperScreen.BOTH);
-    }
-
-    @LargeTest
-    public void testSetWallpaperCityScape() throws Exception {
-       mWallpaperHelper.setWallpaperFromGivenCategory("Cityscape",
-                 "Photo by ", WallpaperHelper.WallpaperScreen.BOTH);
-    }
-
-    @LargeTest
-    public void testSetWallpaperTextures() throws Exception {
-       mWallpaperHelper.setWallpaperFromGivenCategory("Textures",
-                 "Photo by ", WallpaperHelper.WallpaperScreen.BOTH);
-    }
-
-    @LargeTest
-    public void testSetWallpaperLife() throws Exception {
-       mWallpaperHelper.setWallpaperFromGivenCategory("Life",
-                 "Photo by ", WallpaperHelper.WallpaperScreen.BOTH);
-    }
-}
diff --git a/tests/functional/launchertests/src/com/android/launcher/functional/WallpaperMediumTests.java b/tests/functional/launchertests/src/com/android/launcher/functional/WallpaperMediumTests.java
deleted file mode 100644
index 57962da..0000000
--- a/tests/functional/launchertests/src/com/android/launcher/functional/WallpaperMediumTests.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * 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 android.launcher.functional;
-
-import android.app.WallpaperManager;
-import android.app.UiAutomation;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.Context;
-import android.graphics.Point;
-import android.os.PowerManager;
-import android.os.RemoteException;
-import android.os.SystemClock;
-import android.platform.test.helpers.SettingsHelperImpl;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.launcherhelper.ILauncherStrategy;
-import android.support.test.launcherhelper.LauncherStrategyFactory;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.Direction;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.Until;
-import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.util.Log;
-import android.view.KeyEvent;
-
-import junit.framework.TestCase;
-import java.io.File;
-import java.io.IOException;
-
-import org.junit.Assert;
-
-public class WallpaperMediumTests extends TestCase {
-    private static final int TIMEOUT = 3000;
-    private static final String WALLPAPER_PACKAGE = "com.google.android.apps.wallpaper";
-    private UiDevice mDevice;
-    private PackageManager mPackageManager;
-    private ILauncherStrategy mLauncherStrategy = null;
-    private WallpaperManager wallpaperManager;
-    private WallpaperHelper mWallpaperHelper;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        mPackageManager = InstrumentationRegistry.getInstrumentation()
-                .getContext().getPackageManager();
-        mDevice.setOrientationNatural();
-        mLauncherStrategy = LauncherStrategyFactory.getInstance(mDevice).getLauncherStrategy();
-        wallpaperManager = WallpaperManager.getInstance
-                (InstrumentationRegistry.getInstrumentation().getContext());
-        mWallpaperHelper = new WallpaperHelper(mDevice,
-                InstrumentationRegistry.getInstrumentation(), wallpaperManager);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mWallpaperHelper.clearAllWallpapers();
-        mDevice.pressBack();
-        mDevice.pressBack();
-        mDevice.pressHome();
-        mDevice.unfreezeRotation();
-        mDevice.waitForIdle();
-        super.tearDown();
-    }
-
-    @MediumTest
-    public void testSetWallpaperLiveEarth() throws Exception {
-         mWallpaperHelper.setWallpaperFromGivenCategory("Live earth",
-                 "Arches National Park", WallpaperHelper.WallpaperScreen.LIVE);
-    }
-
-    @MediumTest
-    public void testSetWallpaperLiveData() throws Exception {
-         mWallpaperHelper.setWallpaperFromGivenCategory("Live data",
-                 "Orbit, Jazz black", WallpaperHelper.WallpaperScreen.LIVE);
-    }
-
-    @MediumTest
-    public void testSetWallpaperNewElements() throws Exception {
-         mWallpaperHelper.setWallpaperFromGivenCategory("New elements",
-                 "Water, Luminous blue", WallpaperHelper.WallpaperScreen.BOTH);
-    }
-
-    @MediumTest
-    public void testSetWallpaperSkyhigh() throws Exception {
-        mWallpaperHelper.setWallpaperFromGivenCategory("Sky high",
-                 "On a journey", WallpaperHelper.WallpaperScreen.BOTH);
-    }
-
-    @MediumTest
-    public void testChangeWallpaperOnHomeScreenOnly() throws Exception {
-        mWallpaperHelper.setWallpaperFromGivenCategory("Sky high",
-                 "On a journey", WallpaperHelper.WallpaperScreen.HOME);
-    }
-
-    @MediumTest
-    public void testChangeWallpaperOnLockScreenOnly() throws Exception {
-        mWallpaperHelper.setWallpaperFromGivenCategory("Sky high",
-                 "Coming to rest", WallpaperHelper.WallpaperScreen.LOCK);
-    }
-
-    @MediumTest
-    public void testChangeWallpaperOnBothScreens() throws Exception {
-        mWallpaperHelper.setWallpaperFromGivenCategory("Sky high",
-                 "Coming to rest", WallpaperHelper.WallpaperScreen.BOTH);
-    }
-}
-
-