Merge "Remove unused Throw Throwable from clearHomescreen method" into tm-qpr-dev am: 48651b2109

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20831584

Change-Id: I7a3f5ed328fa68a139dd464fd7a672cf910dd36b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sebastián Franco
2023-01-18 01:52:26 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 2 deletions

View File

@@ -120,7 +120,7 @@ public class TestWorkspaceBuilder {
* be clean otherwise this doesn't overrides the existing icons.
*/
public FavoriteItemsTransaction fillHotseatIcons(FavoriteItemsTransaction transaction) {
int hotseatCount = InvariantDeviceProfile.INSTANCE.get(mContext).numShownHotseatIcons;
int hotseatCount = InvariantDeviceProfile.INSTANCE.get(mContext).numDatabaseHotseatIcons;
for (int i = 0; i < hotseatCount; i++) {
transaction.addItem(getHotseatValues(i));
}

View File

@@ -299,7 +299,7 @@ public abstract class AbstractLauncherUiTest {
/**
* Removes all icons from homescreen and hotseat.
*/
public void clearHomescreen() throws Throwable {
public void clearHomescreen() {
LauncherSettings.Settings.call(mTargetContext.getContentResolver(),
LauncherSettings.Settings.METHOD_CREATE_EMPTY_DB);
LauncherSettings.Settings.call(mTargetContext.getContentResolver(),