commit cd914c41bc979f256507c7a2b8978e68ce2441b4
author Jon Miranda <jonmiranda@google.com> Wed May 29 12:44:13 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 29 12:44:13 2019 -0700
tree 7689b66149216406bea433c069363012c153e814
parent b0496c5ba026a780fa4a4c738a1ba2d4e96d6268
parent 1d43df01a4611d31f3b631c71df82f209fad1d55

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

Change-Id: I1d7de3bbf6090ce57770825e354fc7890da5e9df

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