OSDN Git Service

Merge deep shortcuts in rounded rect
authorTony Wickham <twickham@google.com>
Tue, 28 Feb 2017 00:30:47 +0000 (16:30 -0800)
committerTony Wickham <twickham@google.com>
Wed, 1 Mar 2017 18:16:16 +0000 (10:16 -0800)
commit51889b0be83dc34c9752fc066d0d6e75ab4f5e26
treeb3c466ce4742e561fc19dce1a1a028a65f28801b
parent7f3526a1a4d5d3578d4648abb1422646d23c6080
Merge deep shortcuts in rounded rect

- DeepShortcutViews are added to ShortcutsItemView, which
  is in PopupContainerWithArrow
- Moved some shortcut-specific logic to ShortcutsItemView
  (namely, touch/long-click handling for draggin shortcuts)
- Moved round-rect clipping to PopupItemView
- Removed collapseToIcon() logic, including
  PillWidthRevealOutlineProvider, which was only used for
  that purpose. It isn't necessary now that the deep
  shortcuts have no background themselves.
- Replaced focus pill drawable with ripple effect on
  shortcuts and notification view.

Bug: 35766387
Change-Id: I6bc09f1851cfbb806df4bf75a6e435b0f1900c9c
17 files changed:
res/drawable/bg_pill_focused.xml [deleted file]
res/drawable/bg_white_pill.xml [deleted file]
res/layout/deep_shortcut.xml
res/layout/notification.xml
res/layout/notification_footer.xml
res/layout/shortcuts_item.xml [new file with mode: 0644]
res/values/dimens.xml
src/com/android/launcher3/AbstractFloatingView.java
src/com/android/launcher3/badge/BadgeRenderer.java
src/com/android/launcher3/notification/NotificationItemView.java
src/com/android/launcher3/notification/NotificationMainView.java
src/com/android/launcher3/popup/PopupContainerWithArrow.java
src/com/android/launcher3/popup/PopupItemView.java
src/com/android/launcher3/popup/PopupPopulator.java
src/com/android/launcher3/shortcuts/DeepShortcutView.java
src/com/android/launcher3/shortcuts/ShortcutsItemView.java [new file with mode: 0644]
src/com/android/launcher3/util/PillWidthRevealOutlineProvider.java [deleted file]