commit 9f9c05e7a87134bbf1f4c2e17370f8aa565fe768
author Bill Yi <byi@google.com> Fri Jul 29 04:12:28 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 29 04:12:28 2016 +0000
tree 9ecf08449c7596b2885b46a5163756e9cbb9ec39
parent 8577a17791a1914e4f9f44d0c2071b6d958aae6e
parent 6c5025a9f53cca2b8ab6f2b2c2902dec1656e0fb

Import translations. DO NOT MERGE
am: 6c5025a9f5  -s ours

Change-Id: Icc53bd9754405e04fb6e639afae16c3ea805738c

src/com/android/launcher3/BaseRecyclerViewFastScrollPopup.java

diff --git a/src/com/android/launcher3/BaseRecyclerViewFastScrollPopup.java b/src/com/android/launcher3/BaseRecyclerViewFastScrollPopup.java
index 37584fe..b4567c5 100644
--- a/src/com/android/launcher3/BaseRecyclerViewFastScrollPopup.java
+++ b/src/com/android/launcher3/BaseRecyclerViewFastScrollPopup.java
@@ -32,9 +32,9 @@
 
     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;

src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java

diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
index ba48f26..7aa2123 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
@@ -735,6 +735,11 @@
      */
     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.