PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 71c92b35: Merge "Properly saving migration cling keys." into jb-ub-now-kermit-release

Browse Source 
* commit '71c92b356099c90d52a848981855be3fef5c895f':
  Properly saving migration cling keys.
This commit is contained in:
Adam Cohen
2014-02-15 00:20:29 +00:00
committed by Android Git Automerger
parent ec3aad2e30 71c92b3560
commit 4227263c21
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/LauncherClings.java
+5 -6
View File
@@ -385,14 +385,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() {
@@ -401,8 +401,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);
@@ -440,12 +439,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) {