summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/keyboard
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2017-01-23 11:47:51 -0800
committerTony Wickham <twickham@google.com>2017-01-25 11:21:47 -0800
commit540913eadf39f1e8632d2b6f0bc33aa635214198 (patch)
treed21e8d2212cdd053c2cca3e8f6236fb73cbe5e1e /src/com/android/launcher3/keyboard
parent43a2f4297893a70ea776f306d3527f05d36c66bd (diff)
downloadpackages_apps_Trebuchet-540913eadf39f1e8632d2b6f0bc33aa635214198.tar.gz
packages_apps_Trebuchet-540913eadf39f1e8632d2b6f0bc33aa635214198.tar.bz2
packages_apps_Trebuchet-540913eadf39f1e8632d2b6f0bc33aa635214198.zip
Refactor DeepShortcutsContainer to PopupContainerWithArrow
- Also added PopupItemView, which takes animation logic from DeepShortcutView, and which DeepShortcutView now extends. - Renamed ShortcutFilter to PopupPopulator, which has support for new item types (not yet used). Also moved populating logic (e.g. UpdateShortcutChild Runnable) to PopupPopulator. Bug: 32410600 Change-Id: Ib6e444ac7ca99c80ba438801c26e62d9542e0ad9
Diffstat (limited to 'src/com/android/launcher3/keyboard')
-rw-r--r--src/com/android/launcher3/keyboard/CustomActionsPopup.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/keyboard/CustomActionsPopup.java b/src/com/android/launcher3/keyboard/CustomActionsPopup.java
index 6603e93b0..bb0b58add 100644
--- a/src/com/android/launcher3/keyboard/CustomActionsPopup.java
+++ b/src/com/android/launcher3/keyboard/CustomActionsPopup.java
@@ -24,10 +24,10 @@ import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
import android.widget.PopupMenu;
import android.widget.PopupMenu.OnMenuItemClickListener;
+import com.android.launcher3.popup.PopupContainerWithArrow;
import com.android.launcher3.ItemInfo;
import com.android.launcher3.Launcher;
import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
-import com.android.launcher3.shortcuts.DeepShortcutsContainer;
import java.util.ArrayList;
import java.util.Collections;
@@ -46,7 +46,7 @@ public class CustomActionsPopup implements OnMenuItemClickListener {
public CustomActionsPopup(Launcher launcher, View icon) {
mLauncher = launcher;
mIcon = icon;
- DeepShortcutsContainer container = DeepShortcutsContainer.getOpen(launcher);
+ PopupContainerWithArrow container = PopupContainerWithArrow.getOpen(launcher);
if (container != null) {
mDelegate = container.getAccessibilityDelegate();
} else {