commit 8dd67c0d68eb359af107263ea4e82e62e51e53ed
author Jon Miranda <jonmiranda@google.com> Wed May 29 12:50:14 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 29 12:50:14 2019 -0700
tree e812a5113ae0b19811d4cbfb0220f7c53209a2f0
parent 956a9c5176085c65ae56685c582829eb4b2d3a5b
parent cd914c41bc979f256507c7a2b8978e68ce2441b4

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

Change-Id: I55ea1c75c3111592e0964bb3af9049778fb139d5

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