Merge "Prevent opening shortcuts container if one is already open." into ub-launcher3-calgary

This commit is contained in:
Tony Wickham
2016-07-29 01:14:22 +00:00
committed by Android (Google) Code Review
@@ -735,6 +735,11 @@ public class DeepShortcutsContainer extends LinearLayout implements View.OnLongC
*/
public static DeepShortcutsContainer showForIcon(BubbleTextView icon) {
Launcher launcher = Launcher.getLauncher(icon.getContext());
if (launcher.getOpenShortcutsContainer() != null) {
// There is already a shortcuts container open, so don't open this one.
icon.clearFocus();
return null;
}
List<String> ids = launcher.getShortcutIdsForItem((ItemInfo) icon.getTag());
if (!ids.isEmpty()) {
// There are shortcuts associated with the app, so defer its drag.