commit 1d43df01a4611d31f3b631c71df82f209fad1d55
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 29 19:33:58 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 29 19:33:58 2019 +0000
tree 61e80d3f51d3eb9783b7b07908691e0b42d07818
parent 8ffa234955cae8d584bd5e416bed543c1664360f
parent c0f1f4f3afe1d6cf275ad4f54fabfc134f0294c3

Merge "Fix bug where changing the display size does not update the launcher grid." into ub-launcher3-qt-dev

src/com/android/launcher3/InvariantDeviceProfile.java

diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 8a8a2fb..bde87cb 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -288,7 +288,9 @@
         InvariantDeviceProfile oldProfile = new InvariantDeviceProfile(this);
 
         // Re-init grid
-        initGrid(context, Utilities.getPrefs(context).getString(KEY_IDP_GRID_NAME, null));
+        // TODO(b/131867841): We pass in null here so that we can calculate the closest profile
+        // without the bias of the grid name.
+        initGrid(context, null);
 
         int changeFlags = 0;
         if (numRows != oldProfile.numRows ||