diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-03-06 16:56:39 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-03-07 09:30:51 -0800 |
commit | 3d706ad70365052e3224fc4f4b0e7d1f5e8abf22 (patch) | |
tree | aad84ca3eddb76da58a7d1cc8ac9ccff84c01393 /tests/src | |
parent | 36f5876d01a25f9a8e0a65422ff193cacd35284f (diff) | |
download | android_packages_apps_Trebuchet-3d706ad70365052e3224fc4f4b0e7d1f5e8abf22.tar.gz android_packages_apps_Trebuchet-3d706ad70365052e3224fc4f4b0e7d1f5e8abf22.tar.bz2 android_packages_apps_Trebuchet-3d706ad70365052e3224fc4f4b0e7d1f5e8abf22.zip |
Separating the config and flags in different directories so that
it is easier to override one or the other
Bug: 36001650
Change-Id: I713f4f5dbcf902614ce9f6c7a73bdace7bdf1ea0
Diffstat (limited to 'tests/src')
3 files changed, 6 insertions, 7 deletions
diff --git a/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java b/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java index d0ba9074c..883be5aa3 100644 --- a/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java +++ b/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java @@ -10,9 +10,9 @@ import android.net.Uri; import android.util.Pair; import com.android.launcher3.ItemInfo; +import com.android.launcher3.LauncherProvider; import com.android.launcher3.LauncherSettings; import com.android.launcher3.ShortcutInfo; -import com.android.launcher3.config.ProviderConfig; import com.android.launcher3.util.GridOccupancy; import com.android.launcher3.util.LongArrayMap; import com.android.launcher3.util.Provider; @@ -178,6 +178,6 @@ public class AddWorkspaceItemsTaskTest extends BaseModelUpdateTaskTestCase { v.put(LauncherSettings.WorkspaceScreens.SCREEN_RANK, i); ops.add(ContentProviderOperation.newInsert(uri).withValues(v).build()); } - getMockContentResolver().applyBatch(ProviderConfig.AUTHORITY, ops); + getMockContentResolver().applyBatch(LauncherProvider.AUTHORITY, ops); } } diff --git a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java index b9944db98..2ad3cba0f 100644 --- a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java +++ b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java @@ -24,7 +24,7 @@ import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherModel; import com.android.launcher3.LauncherModel.BaseModelUpdateTask; import com.android.launcher3.LauncherModel.Callbacks; -import com.android.launcher3.config.ProviderConfig; +import com.android.launcher3.LauncherProvider; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.Provider; import com.android.launcher3.util.TestLauncherProvider; @@ -64,7 +64,7 @@ public class BaseModelUpdateTaskTestCase extends ProviderTestCase2<TestLauncherP public Callbacks callbacks; public BaseModelUpdateTaskTestCase() { - super(TestLauncherProvider.class, ProviderConfig.AUTHORITY); + super(TestLauncherProvider.class, LauncherProvider.AUTHORITY); } @Override diff --git a/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java b/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java index fc7fe48fd..fd62d3644 100644 --- a/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java +++ b/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java @@ -1,7 +1,6 @@ package com.android.launcher3.model; import android.content.ContentValues; -import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.graphics.Point; @@ -10,9 +9,9 @@ import android.test.suitebuilder.annotation.MediumTest; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherModel; +import com.android.launcher3.LauncherProvider; import com.android.launcher3.LauncherSettings; import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.config.ProviderConfig; import com.android.launcher3.model.GridSizeMigrationTask.MultiStepMigrationTask; import com.android.launcher3.util.TestLauncherProvider; @@ -40,7 +39,7 @@ public class GridSizeMigrationTaskTest extends ProviderTestCase2<TestLauncherPro private InvariantDeviceProfile mIdp; public GridSizeMigrationTaskTest() { - super(TestLauncherProvider.class, ProviderConfig.AUTHORITY); + super(TestLauncherProvider.class, LauncherProvider.AUTHORITY); } @Override |