Fix unintended dynamic grid resize side effects.

- Do not attempt to resize the grid unless the dynamic grid resize has
  been explicitly triggered.
- Workspace Ids are 1 indexed not 0, so on resize, start at 1.
- After resizing the grid, persist the changes to the DB. The initial
  implementation only did the resize in memory and did not persist this,
  causing side effects later.

Bugs fixed:

1. Resize the dynamic grid from large to small. Add a new icon by
installing a new app or adding a shortcut from file manager. The new
icon will overlap one on one of the new pages.

2. Resize the grid from large to small in a previous version of
trebuchet (before the grid resize feature was added). Icons on the outer
edges of the grid will be lost but persist in the DB. Upgrade to a new
version of Trebuchet. The icons will return to the workspace.

Change-Id: I8b0defafb3299d1f3d534526a75f9253495d739d

1 files changed, 5 insertions, 5 deletions

diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
index 9882c7625..df9a1f05b 100644
--- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
+++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
@@ -288,7 +288,7 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                     switch (position) {
                         case 0:
                             updateSearchBarVisibility(v);
-                            mLauncher.setUpdateDynamicGrid();
+                            mLauncher.setUpdateDynamicGrid(false);
                             break;
                         case 1:
                             mLauncher.onClickTransitionEffectButton(v, false);
@@ -297,13 +297,13 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                             onIconLabelsBooleanChanged(v,
                                     SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS,
                                     R.bool.preferences_interface_homescreen_hide_icon_labels_default);
-                            mLauncher.setUpdateDynamicGrid();
+                            mLauncher.setUpdateDynamicGrid(false);
                             break;
                         case 3:
                             onSettingsBooleanChanged(v,
                                     SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_WALLPAPER_SCROLL,
                                     R.bool.preferences_interface_homescreen_scrolling_wallpaper_scroll_default);
-                            mLauncher.setUpdateDynamicGrid();
+                            mLauncher.setUpdateDynamicGrid(false);
                             break;
                         case 4:
                             mLauncher.onClickDynamicGridSizeButton();
@@ -328,7 +328,7 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                             onIconLabelsBooleanChanged(v,
                                     SettingsProvider.SETTINGS_UI_DRAWER_HIDE_ICON_LABELS,
                                     R.bool.preferences_interface_drawer_hide_icon_labels_default);
-                            mLauncher.setUpdateDynamicGrid();
+                            mLauncher.setUpdateDynamicGrid(false);
                             break;
                     }
                     break;
@@ -338,7 +338,7 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                             onSettingsBooleanChanged(v,
                                     SettingsProvider.SETTINGS_UI_GENERAL_ICONS_LARGE,
                                     R.bool.preferences_interface_general_icons_large_default);
-                            mLauncher.setUpdateDynamicGrid();
+                            mLauncher.setUpdateDynamicGrid(false);
                             break;
                         case 1:
                             Intent intent = new Intent();