aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-05 18:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert "Clear only workspace shortcut / widget related tests"" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-10-19 19:56:29 +00:00
committed by Android (Google) Code Review
parent b4307ff8aa 9b3dd6c0b9
commit 06146a1944
6 changed files with 9 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/launcher3/LauncherProvider.java
View File

@@ -461,13 +461,6 @@ public class LauncherProvider extends ContentProvider {
app.getModel().forceReload();
return null;
}
case LauncherSettings.Settings.METHOD_CLEAR_WORKSPACE:
{
Bundle result = new Bundle();
result.putIntArray(LauncherSettings.Settings.EXTRA_VALUE, clearWorkspace()
.toArray());
return result;
}
}
return null;
}
@@ -504,30 +497,6 @@ public class LauncherProvider extends ContentProvider {
}
}
/**
* Deletes any items from the DB apart from hotseat.
* @return Ids of deleted items.
*/
private IntArray clearWorkspace() {
SQLiteDatabase db = mOpenHelper.getWritableDatabase();
try (SQLiteTransaction t = new SQLiteTransaction(db)) {
String selection = LauncherSettings.Favorites.CONTAINER + " <> "
+ LauncherSettings.Favorites.CONTAINER_HOTSEAT;
IntArray itemIds = LauncherDbUtils.queryIntArray(db, Favorites.TABLE_NAME,
Favorites._ID, selection, null, null);
if (!itemIds.isEmpty()) {
db.delete(Favorites.TABLE_NAME, Utilities.createDbSelectionQuery(
LauncherSettings.Favorites._ID, itemIds), null);
}
t.commit();
return itemIds;
} catch (SQLException ex) {
Log.e(TAG, ex.getMessage(), ex);
return new IntArray();
}
}
@Thunk static void addModifiedTime(ContentValues values) {
values.put(LauncherSettings.Favorites.MODIFIED, System.currentTimeMillis());
}

2
src/com/android/launcher3/LauncherSettings.java
View File

@@ -392,8 +392,6 @@ public class LauncherSettings {
public static final String METHOD_SWITCH_DATABASE = "switch_database";
public static final String METHOD_CLEAR_WORKSPACE = "clear_workspace";
public static final String EXTRA_VALUE = "value";
public static final String EXTRA_DB_NAME = "db_name";

11
tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
View File

@@ -288,14 +288,13 @@ public abstract class AbstractLauncherUiTest {
}
/**
* Removes all items from workspace and populate default hotseat.
* Removes all icons from homescreen and hotseat.
*/
public void clearWorkspace() {
// First clear data to ensure hotseat is populated.
clearLauncherData();
// Next make provider call to clear everything apart from hotseat.
public void clearHomescreen() throws Throwable {
LauncherSettings.Settings.call(mTargetContext.getContentResolver(),
LauncherSettings.Settings.METHOD_CLEAR_WORKSPACE);
LauncherSettings.Settings.METHOD_CREATE_EMPTY_DB);
LauncherSettings.Settings.call(mTargetContext.getContentResolver(),
LauncherSettings.Settings.METHOD_CLEAR_EMPTY_DB_FLAG);
resetLoaderState();
}

2
tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
View File

@@ -85,7 +85,7 @@ public class AddConfigWidgetTest extends AbstractLauncherUiTest {
* @param acceptConfig accept the config activity
*/
private void runTest(boolean acceptConfig) throws Throwable {
clearWorkspace();
clearHomescreen();
mDevice.pressHome();
final Widgets widgets = mLauncher.getWorkspace().openAllWidgets();

4
tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
View File

@@ -47,7 +47,7 @@ public class AddWidgetTest extends AbstractLauncherUiTest {
@Test
@PortraitLandscape
public void testDragIcon() throws Throwable {
clearWorkspace();
clearHomescreen();
mDevice.pressHome();
final LauncherAppWidgetProviderInfo widgetInfo =
@@ -81,7 +81,7 @@ public class AddWidgetTest extends AbstractLauncherUiTest {
@Test
@PortraitLandscape
public void testDragCustomShortcut() throws Throwable {
clearWorkspace();
clearHomescreen();
mDevice.pressHome();
mLauncher.getWorkspace().openAllWidgets()
.getWidget("com.android.launcher3.testcomponent.CustomShortcutConfigActivity")

2
tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java
View File

@@ -125,7 +125,7 @@ public class RequestPinItemTest extends AbstractLauncherUiTest {
private void runTest(String activityMethod, boolean isWidget, ItemOperator itemMatcher,
Intent... commandIntents) throws Throwable {
clearWorkspace();
clearHomescreen();
mDevice.pressHome();
// Open Pin item activity