Merge "Remove unused Throw Throwable from clearHomescreen method" into tm-qpr-dev

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

@@ -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

@@ -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(),