commit eb04b8415368ce28bacd100b8bffa85fede734a0
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 16 18:08:15 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 16 18:08:15 2017 +0000
tree c67910eb8eca63a7331ac1a4ced1ef8a082b5bde
parent 6130fa91afde3fa4f690ae3e13182411345e695d
parent f3a13e15843110dd740ce0a6abdf336ea2cd5d80

Merge "Fixing wrong check for grid migration" into ub-launcher3-master

src/com/android/launcher3/model/GridSizeMigrationTask.java

diff --git a/src/com/android/launcher3/model/GridSizeMigrationTask.java b/src/com/android/launcher3/model/GridSizeMigrationTask.java
index 01808c5..e50b912 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationTask.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationTask.java
@@ -918,7 +918,7 @@
         String gridSizeString = getPointString(idp.numColumns, idp.numRows);
 
         if (gridSizeString.equals(prefs.getString(KEY_MIGRATION_SRC_WORKSPACE_SIZE, "")) &&
-                idp.numHotseatIcons != prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, idp.numHotseatIcons)) {
+                idp.numHotseatIcons == prefs.getInt(KEY_MIGRATION_SRC_HOTSEAT_COUNT, idp.numHotseatIcons)) {
             // Skip if workspace and hotseat sizes have not changed.
             return true;
         }