version:1.5
fix:迁移到奥乐云平台 add:
This commit is contained in:
@@ -13,14 +13,14 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.android.colorfulos.allapps.search;
|
||||
package com.aoleyun.os.allapps.search;
|
||||
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import android.content.ComponentName;
|
||||
|
||||
import com.android.colorfulos.AppInfo;
|
||||
import com.aoleyun.os.AppInfo;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.android.colorfulos.model;
|
||||
package com.aoleyun.os.model;
|
||||
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
@@ -10,36 +10,36 @@ import androidx.test.InstrumentationRegistry;
|
||||
import androidx.test.filters.SmallTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import com.android.colorfulos.WorkspaceItemInfo;
|
||||
import com.android.colorfulos.icons.IconCache;
|
||||
import com.android.colorfulos.InvariantDeviceProfile;
|
||||
import com.android.colorfulos.ItemInfo;
|
||||
import com.android.colorfulos.LauncherAppState;
|
||||
import com.android.colorfulos.Utilities;
|
||||
import com.android.colorfulos.compat.LauncherAppsCompat;
|
||||
import com.android.colorfulos.icons.BitmapInfo;
|
||||
import com.aoleyun.os.WorkspaceItemInfo;
|
||||
import com.aoleyun.os.icons.IconCache;
|
||||
import com.aoleyun.os.InvariantDeviceProfile;
|
||||
import com.aoleyun.os.ItemInfo;
|
||||
import com.aoleyun.os.LauncherAppState;
|
||||
import com.aoleyun.os.Utilities;
|
||||
import com.aoleyun.os.compat.LauncherAppsCompat;
|
||||
import com.aoleyun.os.icons.BitmapInfo;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites.INTENT;
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites.CELLX;
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites.CELLY;
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites.CONTAINER;
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites.CONTAINER_DESKTOP;
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites.CONTAINER_HOTSEAT;
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites.ICON;
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites.ICON_PACKAGE;
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites.ICON_RESOURCE;
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites.ITEM_TYPE;
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites.PROFILE_ID;
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites.RESTORED;
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites.SCREEN;
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites.TITLE;
|
||||
import static com.android.colorfulos.LauncherSettings.Favorites._ID;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites.INTENT;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites.CELLX;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites.CELLY;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites.CONTAINER;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites.CONTAINER_DESKTOP;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites.CONTAINER_HOTSEAT;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites.ICON;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites.ICON_PACKAGE;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites.ICON_RESOURCE;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites.ITEM_TYPE;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites.PROFILE_ID;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites.RESTORED;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites.SCREEN;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites.TITLE;
|
||||
import static com.aoleyun.os.LauncherSettings.Favorites._ID;
|
||||
import static junit.framework.Assert.assertEquals;
|
||||
import static junit.framework.Assert.assertFalse;
|
||||
import static junit.framework.Assert.assertNotNull;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.android.colorfulos.provider;
|
||||
package com.aoleyun.os.provider;
|
||||
|
||||
import android.content.ContentValues;
|
||||
import android.database.Cursor;
|
||||
@@ -7,8 +7,8 @@ import androidx.test.InstrumentationRegistry;
|
||||
import androidx.test.filters.MediumTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import com.android.colorfulos.LauncherProvider.DatabaseHelper;
|
||||
import com.android.colorfulos.LauncherSettings.Favorites;
|
||||
import com.aoleyun.os.LauncherProvider.DatabaseHelper;
|
||||
import com.aoleyun.os.LauncherSettings.Favorites;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
@@ -13,7 +13,7 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.testcomponent;
|
||||
package com.aoleyun.os.testcomponent;
|
||||
|
||||
import android.appwidget.AppWidgetProvider;
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.testcomponent;
|
||||
package com.aoleyun.os.testcomponent;
|
||||
|
||||
import android.appwidget.AppWidgetProvider;
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.testcomponent;
|
||||
package com.aoleyun.os.testcomponent;
|
||||
|
||||
/**
|
||||
* A simple app widget with configuration sceen.
|
||||
@@ -13,7 +13,7 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.testcomponent;
|
||||
package com.aoleyun.os.testcomponent;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.BroadcastReceiver;
|
||||
@@ -13,7 +13,7 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.testcomponent;
|
||||
package com.aoleyun.os.testcomponent;
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.app.PendingIntent;
|
||||
@@ -13,7 +13,7 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.testcomponent;
|
||||
package com.aoleyun.os.testcomponent;
|
||||
|
||||
import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
|
||||
import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
|
||||
@@ -13,7 +13,7 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.testcomponent;
|
||||
package com.aoleyun.os.testcomponent;
|
||||
|
||||
import static android.content.Intent.ACTION_MAIN;
|
||||
import static android.content.Intent.CATEGORY_LAUNCHER;
|
||||
@@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.android.colorfulos.testcomponent;
|
||||
package com.aoleyun.os.testcomponent;
|
||||
|
||||
import android.graphics.Point;
|
||||
import android.util.Pair;
|
||||
@@ -13,7 +13,7 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.testcomponent;
|
||||
package com.aoleyun.os.testcomponent;
|
||||
|
||||
import android.os.Bundle;
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.android.colorfulos.touch;
|
||||
package com.aoleyun.os.touch;
|
||||
|
||||
import static org.mockito.Matchers.anyBoolean;
|
||||
import static org.mockito.Matchers.anyFloat;
|
||||
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.verify;
|
||||
import android.util.Log;
|
||||
import android.view.ViewConfiguration;
|
||||
|
||||
import com.android.colorfulos.testcomponent.TouchEventGenerator;
|
||||
import com.aoleyun.os.testcomponent.TouchEventGenerator;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -13,12 +13,10 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.ui;
|
||||
package com.aoleyun.os.ui;
|
||||
|
||||
import static androidx.test.InstrumentationRegistry.getInstrumentation;
|
||||
|
||||
import static com.android.colorfulos.ui.TaplTestsLauncher3.getAppPackageName;
|
||||
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
@@ -44,22 +42,22 @@ import androidx.test.uiautomator.UiDevice;
|
||||
import androidx.test.uiautomator.UiObject2;
|
||||
import androidx.test.uiautomator.Until;
|
||||
|
||||
import com.android.colorfulos.Launcher;
|
||||
import com.android.colorfulos.LauncherAppState;
|
||||
import com.android.colorfulos.LauncherModel;
|
||||
import com.android.colorfulos.LauncherSettings;
|
||||
import com.android.colorfulos.LauncherState;
|
||||
import com.android.colorfulos.MainThreadExecutor;
|
||||
import com.android.colorfulos.ResourceUtils;
|
||||
import com.android.colorfulos.Utilities;
|
||||
import com.android.colorfulos.compat.LauncherAppsCompat;
|
||||
import com.android.colorfulos.model.AppLaunchTracker;
|
||||
import com.android.colorfulos.tapl.LauncherInstrumentation;
|
||||
import com.android.colorfulos.tapl.TestHelpers;
|
||||
import com.android.colorfulos.util.Wait;
|
||||
import com.android.colorfulos.util.rule.FailureWatcher;
|
||||
import com.android.colorfulos.util.rule.LauncherActivityRule;
|
||||
import com.android.colorfulos.util.rule.ShellCommandRule;
|
||||
import com.aoleyun.os.Launcher;
|
||||
import com.aoleyun.os.LauncherAppState;
|
||||
import com.aoleyun.os.LauncherModel;
|
||||
import com.aoleyun.os.LauncherSettings;
|
||||
import com.aoleyun.os.LauncherState;
|
||||
import com.aoleyun.os.MainThreadExecutor;
|
||||
import com.aoleyun.os.ResourceUtils;
|
||||
import com.aoleyun.os.Utilities;
|
||||
import com.aoleyun.os.compat.LauncherAppsCompat;
|
||||
import com.aoleyun.os.model.AppLaunchTracker;
|
||||
import com.aoleyun.os.tapl.LauncherInstrumentation;
|
||||
import com.aoleyun.os.tapl.TestHelpers;
|
||||
import com.aoleyun.os.util.Wait;
|
||||
import com.aoleyun.os.util.rule.FailureWatcher;
|
||||
import com.aoleyun.os.util.rule.LauncherActivityRule;
|
||||
import com.aoleyun.os.util.rule.ShellCommandRule;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
@@ -342,14 +340,14 @@ public abstract class AbstractLauncherUiTest {
|
||||
}
|
||||
|
||||
protected void startTestActivity(int activityNumber) {
|
||||
final String packageName = getAppPackageName();
|
||||
final String packageName = TaplTestsLauncher3.getAppPackageName();
|
||||
final Instrumentation instrumentation = getInstrumentation();
|
||||
final Intent intent = instrumentation.getContext().getPackageManager().
|
||||
getLaunchIntentForPackage(packageName);
|
||||
intent.addCategory(Intent.CATEGORY_LAUNCHER);
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
intent.setComponent(new ComponentName(packageName,
|
||||
"com.android.colorfulos.tests.Activity" + activityNumber));
|
||||
"com.aoleyun.os.tests.Activity" + activityNumber));
|
||||
instrumentation.getTargetContext().startActivity(intent);
|
||||
assertTrue(packageName + " didn't start",
|
||||
mDevice.wait(
|
||||
@@ -13,7 +13,7 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.ui;
|
||||
package com.aoleyun.os.ui;
|
||||
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
@@ -29,10 +29,10 @@ import androidx.test.InstrumentationRegistry;
|
||||
import androidx.test.filters.MediumTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import com.android.colorfulos.LauncherAppWidgetProviderInfo;
|
||||
import com.android.colorfulos.testcomponent.TestCommandReceiver;
|
||||
import com.android.colorfulos.util.LauncherLayoutBuilder;
|
||||
import com.android.colorfulos.util.rule.ShellCommandRule;
|
||||
import com.aoleyun.os.LauncherAppWidgetProviderInfo;
|
||||
import com.aoleyun.os.testcomponent.TestCommandReceiver;
|
||||
import com.aoleyun.os.util.LauncherLayoutBuilder;
|
||||
import com.aoleyun.os.util.rule.ShellCommandRule;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.android.colorfulos.ui;
|
||||
package com.aoleyun.os.ui;
|
||||
|
||||
import android.view.Surface;
|
||||
|
||||
import com.android.colorfulos.tapl.TestHelpers;
|
||||
import com.aoleyun.os.tapl.TestHelpers;
|
||||
|
||||
import org.junit.rules.TestRule;
|
||||
import org.junit.runner.Description;
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.colorfulos.ui;
|
||||
package com.aoleyun.os.ui;
|
||||
|
||||
import static androidx.test.InstrumentationRegistry.getInstrumentation;
|
||||
|
||||
@@ -27,18 +27,18 @@ import static org.junit.Assert.assertTrue;
|
||||
import androidx.test.filters.LargeTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import com.android.colorfulos.Launcher;
|
||||
import com.android.colorfulos.LauncherState;
|
||||
import com.android.colorfulos.popup.ArrowPopup;
|
||||
import com.android.colorfulos.tapl.AllApps;
|
||||
import com.android.colorfulos.tapl.AppIcon;
|
||||
import com.android.colorfulos.tapl.AppIconMenu;
|
||||
import com.android.colorfulos.tapl.AppIconMenuItem;
|
||||
import com.android.colorfulos.tapl.Widgets;
|
||||
import com.android.colorfulos.tapl.Workspace;
|
||||
import com.android.colorfulos.views.OptionsPopupView;
|
||||
import com.android.colorfulos.widget.WidgetsFullSheet;
|
||||
import com.android.colorfulos.widget.WidgetsRecyclerView;
|
||||
import com.aoleyun.os.Launcher;
|
||||
import com.aoleyun.os.LauncherState;
|
||||
import com.aoleyun.os.popup.ArrowPopup;
|
||||
import com.aoleyun.os.tapl.AllApps;
|
||||
import com.aoleyun.os.tapl.AppIcon;
|
||||
import com.aoleyun.os.tapl.AppIconMenu;
|
||||
import com.aoleyun.os.tapl.AppIconMenuItem;
|
||||
import com.aoleyun.os.tapl.Widgets;
|
||||
import com.aoleyun.os.tapl.Workspace;
|
||||
import com.aoleyun.os.views.OptionsPopupView;
|
||||
import com.aoleyun.os.widget.WidgetsFullSheet;
|
||||
import com.aoleyun.os.widget.WidgetsRecyclerView;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
@@ -13,7 +13,7 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.ui;
|
||||
package com.aoleyun.os.ui;
|
||||
|
||||
import static androidx.test.InstrumentationRegistry.getInstrumentation;
|
||||
import static androidx.test.InstrumentationRegistry.getTargetContext;
|
||||
@@ -38,11 +38,11 @@ import androidx.test.uiautomator.UiDevice;
|
||||
import androidx.test.uiautomator.UiObject2;
|
||||
import androidx.test.uiautomator.Until;
|
||||
|
||||
import com.android.colorfulos.LauncherAppWidgetProviderInfo;
|
||||
import com.android.colorfulos.R;
|
||||
import com.android.colorfulos.compat.AppWidgetManagerCompat;
|
||||
import com.android.colorfulos.testcomponent.AppWidgetNoConfig;
|
||||
import com.android.colorfulos.testcomponent.AppWidgetWithConfig;
|
||||
import com.aoleyun.os.LauncherAppWidgetProviderInfo;
|
||||
import com.aoleyun.os.R;
|
||||
import com.aoleyun.os.compat.AppWidgetManagerCompat;
|
||||
import com.aoleyun.os.testcomponent.AppWidgetNoConfig;
|
||||
import com.aoleyun.os.testcomponent.AppWidgetWithConfig;
|
||||
|
||||
import java.util.concurrent.Callable;
|
||||
import java.util.function.Function;
|
||||
@@ -13,9 +13,9 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.android.colorfulos.ui;
|
||||
package com.aoleyun.os.ui;
|
||||
|
||||
import static com.android.colorfulos.LauncherState.ALL_APPS;
|
||||
import static com.aoleyun.os.LauncherState.ALL_APPS;
|
||||
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.ui.widget;
|
||||
package com.aoleyun.os.ui.widget;
|
||||
|
||||
import static androidx.test.InstrumentationRegistry.getInstrumentation;
|
||||
|
||||
@@ -30,17 +30,17 @@ import androidx.test.runner.AndroidJUnit4;
|
||||
import androidx.test.uiautomator.By;
|
||||
import androidx.test.uiautomator.UiObject2;
|
||||
|
||||
import com.android.colorfulos.ItemInfo;
|
||||
import com.android.colorfulos.LauncherAppWidgetInfo;
|
||||
import com.android.colorfulos.LauncherAppWidgetProviderInfo;
|
||||
import com.android.colorfulos.Workspace;
|
||||
import com.android.colorfulos.testcomponent.WidgetConfigActivity;
|
||||
import com.android.colorfulos.ui.AbstractLauncherUiTest;
|
||||
import com.android.colorfulos.ui.TestViewHelpers;
|
||||
import com.android.colorfulos.util.Condition;
|
||||
import com.android.colorfulos.util.Wait;
|
||||
import com.android.colorfulos.util.rule.ShellCommandRule;
|
||||
import com.android.colorfulos.widget.WidgetCell;
|
||||
import com.aoleyun.os.ItemInfo;
|
||||
import com.aoleyun.os.LauncherAppWidgetInfo;
|
||||
import com.aoleyun.os.LauncherAppWidgetProviderInfo;
|
||||
import com.aoleyun.os.Workspace;
|
||||
import com.aoleyun.os.testcomponent.WidgetConfigActivity;
|
||||
import com.aoleyun.os.ui.AbstractLauncherUiTest;
|
||||
import com.aoleyun.os.ui.TestViewHelpers;
|
||||
import com.aoleyun.os.util.Condition;
|
||||
import com.aoleyun.os.util.Wait;
|
||||
import com.aoleyun.os.util.rule.ShellCommandRule;
|
||||
import com.aoleyun.os.widget.WidgetCell;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
@@ -13,7 +13,7 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.ui.widget;
|
||||
package com.aoleyun.os.ui.widget;
|
||||
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
@@ -23,16 +23,16 @@ import androidx.test.uiautomator.By;
|
||||
import androidx.test.uiautomator.UiObject2;
|
||||
import android.view.View;
|
||||
|
||||
import com.android.colorfulos.ItemInfo;
|
||||
import com.android.colorfulos.LauncherAppWidgetInfo;
|
||||
import com.android.colorfulos.LauncherAppWidgetProviderInfo;
|
||||
import com.android.colorfulos.Workspace.ItemOperator;
|
||||
import com.android.colorfulos.ui.AbstractLauncherUiTest;
|
||||
import com.android.colorfulos.ui.TestViewHelpers;
|
||||
import com.android.colorfulos.util.Condition;
|
||||
import com.android.colorfulos.util.Wait;
|
||||
import com.android.colorfulos.util.rule.ShellCommandRule;
|
||||
import com.android.colorfulos.widget.WidgetCell;
|
||||
import com.aoleyun.os.ItemInfo;
|
||||
import com.aoleyun.os.LauncherAppWidgetInfo;
|
||||
import com.aoleyun.os.LauncherAppWidgetProviderInfo;
|
||||
import com.aoleyun.os.Workspace.ItemOperator;
|
||||
import com.aoleyun.os.ui.AbstractLauncherUiTest;
|
||||
import com.aoleyun.os.ui.TestViewHelpers;
|
||||
import com.aoleyun.os.util.Condition;
|
||||
import com.aoleyun.os.util.Wait;
|
||||
import com.aoleyun.os.util.rule.ShellCommandRule;
|
||||
import com.aoleyun.os.widget.WidgetCell;
|
||||
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Rule;
|
||||
@@ -13,9 +13,9 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.ui.widget;
|
||||
package com.aoleyun.os.ui.widget;
|
||||
|
||||
import static com.android.colorfulos.WorkspaceLayoutManager.FIRST_SCREEN_ID;
|
||||
import static com.aoleyun.os.WorkspaceLayoutManager.FIRST_SCREEN_ID;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
@@ -34,19 +34,19 @@ import android.os.Bundle;
|
||||
import androidx.test.filters.LargeTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import com.android.colorfulos.LauncherAppWidgetHost;
|
||||
import com.android.colorfulos.LauncherAppWidgetInfo;
|
||||
import com.android.colorfulos.LauncherAppWidgetProviderInfo;
|
||||
import com.android.colorfulos.LauncherSettings;
|
||||
import com.android.colorfulos.compat.AppWidgetManagerCompat;
|
||||
import com.android.colorfulos.compat.PackageInstallerCompat;
|
||||
import com.android.colorfulos.tapl.Workspace;
|
||||
import com.android.colorfulos.ui.AbstractLauncherUiTest;
|
||||
import com.android.colorfulos.ui.TestViewHelpers;
|
||||
import com.android.colorfulos.util.ContentWriter;
|
||||
import com.android.colorfulos.util.rule.ShellCommandRule;
|
||||
import com.android.colorfulos.widget.PendingAddWidgetInfo;
|
||||
import com.android.colorfulos.widget.WidgetHostViewLoader;
|
||||
import com.aoleyun.os.LauncherAppWidgetHost;
|
||||
import com.aoleyun.os.LauncherAppWidgetInfo;
|
||||
import com.aoleyun.os.LauncherAppWidgetProviderInfo;
|
||||
import com.aoleyun.os.LauncherSettings;
|
||||
import com.aoleyun.os.compat.AppWidgetManagerCompat;
|
||||
import com.aoleyun.os.compat.PackageInstallerCompat;
|
||||
import com.aoleyun.os.tapl.Workspace;
|
||||
import com.aoleyun.os.ui.AbstractLauncherUiTest;
|
||||
import com.aoleyun.os.ui.TestViewHelpers;
|
||||
import com.aoleyun.os.util.ContentWriter;
|
||||
import com.aoleyun.os.util.rule.ShellCommandRule;
|
||||
import com.aoleyun.os.widget.PendingAddWidgetInfo;
|
||||
import com.aoleyun.os.widget.WidgetHostViewLoader;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
@@ -13,9 +13,7 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.ui.widget;
|
||||
|
||||
import static com.android.colorfulos.ui.TaplTestsLauncher3.getAppPackageName;
|
||||
package com.aoleyun.os.ui.widget;
|
||||
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertNotSame;
|
||||
@@ -29,21 +27,22 @@ import android.view.View;
|
||||
import androidx.test.filters.LargeTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import com.android.colorfulos.ItemInfo;
|
||||
import com.android.colorfulos.LauncherAppWidgetInfo;
|
||||
import com.android.colorfulos.LauncherSettings.Favorites;
|
||||
import com.android.colorfulos.Utilities;
|
||||
import com.android.colorfulos.Workspace.ItemOperator;
|
||||
import com.android.colorfulos.WorkspaceItemInfo;
|
||||
import com.android.colorfulos.shortcuts.ShortcutKey;
|
||||
import com.android.colorfulos.tapl.AddToHomeScreenPrompt;
|
||||
import com.android.colorfulos.testcomponent.AppWidgetNoConfig;
|
||||
import com.android.colorfulos.testcomponent.AppWidgetWithConfig;
|
||||
import com.android.colorfulos.testcomponent.RequestPinItemActivity;
|
||||
import com.android.colorfulos.ui.AbstractLauncherUiTest;
|
||||
import com.android.colorfulos.util.Condition;
|
||||
import com.android.colorfulos.util.Wait;
|
||||
import com.android.colorfulos.util.rule.ShellCommandRule;
|
||||
import com.aoleyun.os.ItemInfo;
|
||||
import com.aoleyun.os.LauncherAppWidgetInfo;
|
||||
import com.aoleyun.os.LauncherSettings.Favorites;
|
||||
import com.aoleyun.os.Utilities;
|
||||
import com.aoleyun.os.Workspace.ItemOperator;
|
||||
import com.aoleyun.os.WorkspaceItemInfo;
|
||||
import com.aoleyun.os.shortcuts.ShortcutKey;
|
||||
import com.aoleyun.os.tapl.AddToHomeScreenPrompt;
|
||||
import com.aoleyun.os.testcomponent.AppWidgetNoConfig;
|
||||
import com.aoleyun.os.testcomponent.AppWidgetWithConfig;
|
||||
import com.aoleyun.os.testcomponent.RequestPinItemActivity;
|
||||
import com.aoleyun.os.ui.AbstractLauncherUiTest;
|
||||
import com.aoleyun.os.util.Condition;
|
||||
import com.aoleyun.os.util.Wait;
|
||||
import com.aoleyun.os.util.rule.ShellCommandRule;
|
||||
import com.aoleyun.os.ui.TaplTestsLauncher3;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
@@ -140,7 +139,7 @@ public class RequestPinItemTest extends AbstractLauncherUiTest {
|
||||
getWorkspace().
|
||||
switchToAllApps().
|
||||
getAppIcon("Test Pin Item").
|
||||
launch(getAppPackageName());
|
||||
launch(TaplTestsLauncher3.getAppPackageName());
|
||||
assertNotNull(openMonitor.blockingGetExtraIntent());
|
||||
|
||||
// Set callback
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.android.colorfulos.util;
|
||||
package com.aoleyun.os.util;
|
||||
|
||||
import androidx.test.uiautomator.UiObject2;
|
||||
|
||||
import com.android.colorfulos.MainThreadExecutor;
|
||||
import com.aoleyun.os.MainThreadExecutor;
|
||||
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
@@ -13,7 +13,7 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.util;
|
||||
package com.aoleyun.os.util;
|
||||
|
||||
|
||||
import android.text.TextUtils;
|
||||
@@ -14,10 +14,10 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.colorfulos.util;
|
||||
package com.aoleyun.os.util;
|
||||
|
||||
import static com.android.colorfulos.util.RaceConditionTracker.ENTER_POSTFIX;
|
||||
import static com.android.colorfulos.util.RaceConditionTracker.EXIT_POSTFIX;
|
||||
import static com.aoleyun.os.util.RaceConditionTracker.ENTER_POSTFIX;
|
||||
import static com.aoleyun.os.util.RaceConditionTracker.EXIT_POSTFIX;
|
||||
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.fail;
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.colorfulos.util;
|
||||
package com.aoleyun.os.util;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
@@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.android.colorfulos.util;
|
||||
package com.aoleyun.os.util;
|
||||
|
||||
import static androidx.test.InstrumentationRegistry.getContext;
|
||||
import static androidx.test.InstrumentationRegistry.getInstrumentation;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.android.colorfulos.util;
|
||||
package com.aoleyun.os.util;
|
||||
|
||||
import android.os.SystemClock;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.android.colorfulos.util.rule;
|
||||
package com.aoleyun.os.util.rule;
|
||||
|
||||
import static androidx.test.InstrumentationRegistry.getInstrumentation;
|
||||
|
||||
@@ -13,9 +13,7 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.util.rule;
|
||||
|
||||
import static com.android.colorfulos.tapl.TestHelpers.getHomeIntentInPackage;
|
||||
package com.aoleyun.os.util.rule;
|
||||
|
||||
import static androidx.test.InstrumentationRegistry.getInstrumentation;
|
||||
import static androidx.test.InstrumentationRegistry.getTargetContext;
|
||||
@@ -26,8 +24,9 @@ import android.app.Application.ActivityLifecycleCallbacks;
|
||||
import android.os.Bundle;
|
||||
import androidx.test.InstrumentationRegistry;
|
||||
|
||||
import com.android.colorfulos.Launcher;
|
||||
import com.android.colorfulos.Workspace.ItemOperator;
|
||||
import com.aoleyun.os.Launcher;
|
||||
import com.aoleyun.os.Workspace.ItemOperator;
|
||||
import com.aoleyun.os.tapl.TestHelpers;
|
||||
|
||||
import org.junit.rules.TestRule;
|
||||
import org.junit.runner.Description;
|
||||
@@ -69,7 +68,7 @@ public class LauncherActivityRule implements TestRule {
|
||||
* Starts the launcher activity in the target package.
|
||||
*/
|
||||
public void startLauncher() {
|
||||
getInstrumentation().startActivitySync(getHomeIntentInPackage(getTargetContext()));
|
||||
getInstrumentation().startActivitySync(TestHelpers.getHomeIntentInPackage(getTargetContext()));
|
||||
}
|
||||
|
||||
private class MyStatement extends Statement implements ActivityLifecycleCallbacks {
|
||||
@@ -13,9 +13,7 @@
|
||||
* License for the specific language governing permissions and limitations under
|
||||
* the License.
|
||||
*/
|
||||
package com.android.colorfulos.util.rule;
|
||||
|
||||
import static com.android.colorfulos.tapl.TestHelpers.getLauncherInMyProcess;
|
||||
package com.aoleyun.os.util.rule;
|
||||
|
||||
import static androidx.test.InstrumentationRegistry.getInstrumentation;
|
||||
|
||||
@@ -30,6 +28,8 @@ import androidx.annotation.Nullable;
|
||||
import androidx.test.InstrumentationRegistry;
|
||||
import androidx.test.uiautomator.UiDevice;
|
||||
|
||||
import com.aoleyun.os.tapl.TestHelpers;
|
||||
|
||||
/**
|
||||
* Test rule which executes a shell command at the start of the test.
|
||||
*/
|
||||
@@ -72,7 +72,7 @@ public class ShellCommandRule implements TestRule {
|
||||
* Sets the target launcher as default launcher.
|
||||
*/
|
||||
public static ShellCommandRule setDefaultLauncher() {
|
||||
return new ShellCommandRule(getLauncherCommand(getLauncherInMyProcess()), null);
|
||||
return new ShellCommandRule(getLauncherCommand(TestHelpers.getLauncherInMyProcess()), null);
|
||||
}
|
||||
|
||||
public static String getLauncherCommand(ActivityInfo launcher) {
|
||||
@@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.android.colorfulos.widget;
|
||||
package com.aoleyun.os.widget;
|
||||
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Matchers.isNull;
|
||||
@@ -28,14 +28,14 @@ import androidx.test.filters.SmallTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
import android.view.LayoutInflater;
|
||||
|
||||
import com.android.colorfulos.icons.IconCache;
|
||||
import com.android.colorfulos.InvariantDeviceProfile;
|
||||
import com.android.colorfulos.LauncherAppWidgetProviderInfo;
|
||||
import com.android.colorfulos.WidgetPreviewLoader;
|
||||
import com.android.colorfulos.compat.AppWidgetManagerCompat;
|
||||
import com.android.colorfulos.model.PackageItemInfo;
|
||||
import com.android.colorfulos.model.WidgetItem;
|
||||
import com.android.colorfulos.util.MultiHashMap;
|
||||
import com.aoleyun.os.icons.IconCache;
|
||||
import com.aoleyun.os.InvariantDeviceProfile;
|
||||
import com.aoleyun.os.LauncherAppWidgetProviderInfo;
|
||||
import com.aoleyun.os.WidgetPreviewLoader;
|
||||
import com.aoleyun.os.compat.AppWidgetManagerCompat;
|
||||
import com.aoleyun.os.model.PackageItemInfo;
|
||||
import com.aoleyun.os.model.WidgetItem;
|
||||
import com.aoleyun.os.util.MultiHashMap;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
Reference in New Issue
Block a user