From 3037abb7396dd8dbabd2cc95fc096f26825e9ab1 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Sat, 3 Jan 2015 13:48:45 +0100
Subject: Update workspace grid after toggling settings.

Change-Id: I851023e47fe12e434357962ee5f5b55b761da4c7
---
 src/com/android/launcher3/AppsCustomizePagedView.java | 17 ++++++++++++-----
 src/com/android/launcher3/DeviceProfile.java          |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'src/com')

diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index 46703979e..8e25e025e 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -475,11 +475,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
     protected void onDataReady(int width, int height) {
         // Now that the data is ready, we can calculate the content width, the number of cells to
         // use for each page
-        LauncherAppState app = LauncherAppState.getInstance();
-        DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
-        mCellCountX = (int) grid.allAppsNumCols;
-        mCellCountY = (int) grid.allAppsNumRows;
-        updatePageCounts();
+        updateGridSize();
 
         // Force a measure to update recalculate the gaps
         mContentWidth = getMeasuredWidth() - getPaddingLeft() - getPaddingRight();
@@ -493,6 +489,17 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
         invalidatePageData(Math.max(0, page), hostIsTransitioning);
     }
 
+    public void updateGridSize() {
+        if (!isDataReady()) {
+            return;
+        }
+        LauncherAppState app = LauncherAppState.getInstance();
+        DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
+        mCellCountX = (int) grid.allAppsNumCols;
+        mCellCountY = (int) grid.allAppsNumRows;
+        updatePageCounts();
+    }
+
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
         super.onLayout(changed, l, t, r, b);
 
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index c92eae4cb..9bdfcf41b 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -925,6 +925,7 @@ public class DeviceProfile {
 
             padding = new Rect();
             if (pagedView != null) {
+                pagedView.updateGridSize();
                 // Constrain the dimensions of all apps so that it does not span the full width
                 int paddingLR = (availableWidthPx - (allAppsCellWidthPx * allAppsNumCols)) /
                         (2 * (allAppsNumCols + 1));
-- 
cgit v1.2.3