Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c18a4081 authored by Sebastián Franco's avatar Sebastián Franco Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I7a3f5ed328fa68a139dd464fd7a672cf910dd36b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ee929a5a 48651b21

tests/src/com/android/launcher3/celllayout/TestWorkspaceBuilder.java

+1 −1
Original line number Diff line number Diff line
@@ -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));

        }

tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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(),