diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-10-25 23:07:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-10-25 23:07:06 +0000 |
| commit | 2c8927889544556a3b13d77130076e2d0f862f43 (patch) | |
| tree | 7f78fec797f8b6739809056145a29f45323cabcf /src | |
| parent | a96f9165044179c22e64481d574cb61a6a7baa91 (diff) | |
| parent | f908a2e50e44d828583aa35e37e22334a50fc300 (diff) | |
| download | android_packages_apps_Trebuchet-2c8927889544556a3b13d77130076e2d0f862f43.tar.gz android_packages_apps_Trebuchet-2c8927889544556a3b13d77130076e2d0f862f43.tar.bz2 android_packages_apps_Trebuchet-2c8927889544556a3b13d77130076e2d0f862f43.zip | |
Merge "Adding test methods" into ub-launcher3-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/popup/PopupContainerWithArrow.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/views/OptionsPopupView.java | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index 4f1fcda12..12319f75e 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -221,6 +221,10 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource, factory.getEnabledShortcuts(mLauncher, item)); } + public ViewGroup getSystemShortcutContainerForTesting() { + return mSystemShortcutContainer; + } + @TargetApi(Build.VERSION_CODES.P) protected void populateAndShow(final BubbleTextView originalIcon, int shortcutCount, final List<NotificationKeyData> notificationKeys, List<SystemShortcut> systemShortcuts) { diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java index 3e58ea673..c540b59c1 100644 --- a/src/com/android/launcher3/views/OptionsPopupView.java +++ b/src/com/android/launcher3/views/OptionsPopupView.java @@ -136,7 +136,7 @@ public class OptionsPopupView extends ArrowPopup } @VisibleForTesting - public static OptionsPopupView getOptionsPopup(Launcher launcher) { + public static ArrowPopup getOptionsPopup(Launcher launcher) { return launcher.findViewById(R.id.deep_shortcuts_container); } |