summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2014-01-14 10:30:27 -0800
committerDanesh M <daneshm90@gmail.com>2014-06-06 22:54:25 -0700
commit2762189999d34dd98fb853e1436c762ee4b3b1d8 (patch)
tree3938ab384bc1daf7b2bd86ebba3f7214a8d31fcf /src
parent60f748d669be4794afb2b41add3a399973553429 (diff)
downloadandroid_packages_apps_Trebuchet-2762189999d34dd98fb853e1436c762ee4b3b1d8.tar.gz
android_packages_apps_Trebuchet-2762189999d34dd98fb853e1436c762ee4b3b1d8.tar.bz2
android_packages_apps_Trebuchet-2762189999d34dd98fb853e1436c762ee4b3b1d8.zip
Properly saving migration cling keys.
Change-Id: Id52a12da6af0fc91463dae07bbeb355ee04873d0
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/LauncherClings.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
index 541eaddd0..85937aa62 100644
--- a/src/com/android/launcher3/LauncherClings.java
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -373,14 +373,14 @@ class LauncherClings {
showMigrationWorkspaceCling();
}
};
- dismissCling(cling, cb, WORKSPACE_CLING_DISMISSED_KEY,
+ dismissCling(cling, cb, MIGRATION_CLING_DISMISSED_KEY,
DISMISS_CLING_DURATION, true);
}
};
mLauncher.getWorkspace().post(dismissCb);
}
- private void dismissAnyWorkspaceCling(Cling cling, View v) {
+ private void dismissAnyWorkspaceCling(Cling cling, String key, View v) {
Runnable cb = null;
if (v == null) {
cb = new Runnable() {
@@ -389,8 +389,7 @@ class LauncherClings {
}
};
}
- dismissCling(cling, cb, WORKSPACE_CLING_DISMISSED_KEY,
- DISMISS_CLING_DURATION, true);
+ dismissCling(cling, cb, key, DISMISS_CLING_DURATION, true);
// Fade in the search bar
mLauncher.getSearchBar().showSearchBar(true);
@@ -428,12 +427,12 @@ class LauncherClings {
public void dismissMigrationWorkspaceCling(View v) {
Cling cling = (Cling) mLauncher.findViewById(R.id.migration_workspace_cling);
- dismissAnyWorkspaceCling(cling, v);
+ dismissAnyWorkspaceCling(cling, MIGRATION_WORKSPACE_CLING_DISMISSED_KEY, v);
}
public void dismissWorkspaceCling(View v) {
Cling cling = (Cling) mLauncher.findViewById(R.id.workspace_cling);
- dismissAnyWorkspaceCling(cling, v);
+ dismissAnyWorkspaceCling(cling, WORKSPACE_CLING_DISMISSED_KEY, v);
}
public void dismissFolderCling(View v) {