diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2019-04-17 18:38:52 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2019-04-22 15:39:40 -0700 |
commit | 6bbf6004f8c746cc50c622ec1759f77ea76af9ef (patch) | |
tree | 0740c52b700f0f8bd96505db8b5c10acb434d81e /robolectric_tests/src/com/android/launcher3/model | |
parent | 8b0cb4113fc34ced9a9de71e40f448615ec8210d (diff) | |
download | android_packages_apps_Trebuchet-6bbf6004f8c746cc50c622ec1759f77ea76af9ef.tar.gz android_packages_apps_Trebuchet-6bbf6004f8c746cc50c622ec1759f77ea76af9ef.tar.bz2 android_packages_apps_Trebuchet-6bbf6004f8c746cc50c622ec1759f77ea76af9ef.zip |
Removing ShortcutInfoCompat and directly using ShortcutInfo
Change-Id: I2842689e192a206c0d31558c8126eae1c7904598
Diffstat (limited to 'robolectric_tests/src/com/android/launcher3/model')
-rw-r--r-- | robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java b/robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java index ce07a273f..53f6a06fd 100644 --- a/robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java +++ b/robolectric_tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java @@ -10,8 +10,8 @@ import android.graphics.Point; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherSettings; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.config.FlagOverrideRule; -import com.android.launcher3.config.FlagOverrideRule.FlagOverride; import com.android.launcher3.model.GridSizeMigrationTask.MultiStepMigrationTask; import com.android.launcher3.util.IntArray; @@ -210,9 +210,11 @@ public class GridSizeMigrationTaskTest extends BaseGridChangesTestCase { }}); } - @FlagOverride(key = "QSB_ON_FIRST_SCREEN", value = true) @Test public void testWorkspace_first_row_blocked() throws Exception { + if (!FeatureFlags.QSB_ON_FIRST_SCREEN) { + return; + } // The first screen has one item on the 4th column which needs moving, as the first row // will be kept empty. int[][][] ids = createGrid(new int[][][]{{ @@ -236,9 +238,11 @@ public class GridSizeMigrationTaskTest extends BaseGridChangesTestCase { }}); } - @FlagOverride(key = "QSB_ON_FIRST_SCREEN", value = true) @Test public void testWorkspace_items_moved_to_empty_first_row() throws Exception { + if (!FeatureFlags.QSB_ON_FIRST_SCREEN) { + return; + } // Items will get moved to the next screen to keep the first screen empty. int[][][] ids = createGrid(new int[][][]{{ { -1, -1, -1, -1}, |