diff options
| -rw-r--r-- | src/com/android/launcher3/BaseRecyclerViewFastScrollPopup.java | 6 | ||||
| -rw-r--r-- | src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/launcher3/BaseRecyclerViewFastScrollPopup.java b/src/com/android/launcher3/BaseRecyclerViewFastScrollPopup.java index 37584fede..b4567c53c 100644 --- a/src/com/android/launcher3/BaseRecyclerViewFastScrollPopup.java +++ b/src/com/android/launcher3/BaseRecyclerViewFastScrollPopup.java @@ -32,9 +32,9 @@ public class BaseRecyclerViewFastScrollPopup { private static final float FAST_SCROLL_OVERLAY_Y_OFFSET_FACTOR = 1.5f; - private static final int SHADOW_INSET = 5; - private static final int SHADOW_SHIFT_Y = 4; - private static final float SHADOW_ALPHA_MULTIPLIER = 0.5f; + private static final int SHADOW_INSET = 3; + private static final int SHADOW_SHIFT_Y = 2; + private static final float SHADOW_ALPHA_MULTIPLIER = 0.67f; private Resources mRes; private BaseRecyclerView mRv; diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java index ba48f26bc..7aa212321 100644 --- a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java +++ b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java @@ -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. |