summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/model
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-02-16 18:08:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-02-16 18:08:15 +0000
commiteb04b8415368ce28bacd100b8bffa85fede734a0 (patch)
treec67910eb8eca63a7331ac1a4ced1ef8a082b5bde /src/com/android/launcher3/model
parent6130fa91afde3fa4f690ae3e13182411345e695d (diff)
parentf3a13e15843110dd740ce0a6abdf336ea2cd5d80 (diff)
downloadandroid_packages_apps_Trebuchet-eb04b8415368ce28bacd100b8bffa85fede734a0.tar.gz
android_packages_apps_Trebuchet-eb04b8415368ce28bacd100b8bffa85fede734a0.tar.bz2
android_packages_apps_Trebuchet-eb04b8415368ce28bacd100b8bffa85fede734a0.zip
Merge "Fixing wrong check for grid migration" into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/model')
-rw-r--r--src/com/android/launcher3/model/GridSizeMigrationTask.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/model/GridSizeMigrationTask.java b/src/com/android/launcher3/model/GridSizeMigrationTask.java
index 01808c5ca..e50b912f6 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationTask.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationTask.java
@@ -918,7 +918,7 @@ public class GridSizeMigrationTask {
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;
}