Commit Graph

36 Commits

Author SHA1 Message Date
Tony Wickham be06874c81 Log shortcuts open on ACTION_UP instead of in showForIcon().
- We only want to log when the container is opened and potentially
  used, not when a long press is followed by a drag-and-drop.
- Also cleaned up code that was determining the container of the
  app icon, since LaunchSourceProvider.fillInLaunchSourceData()
  can do that instead (it's more robust and consistent).

Bug: 30791570
Change-Id: I05b6750f26182fda8a9940ac66f1371c2d228ca9
2016-08-10 18:26:41 -07:00
Tony Wickham f0cb6018dd Merge "Start shortcuts close animation where open left off." into ub-launcher3-calgary 2016-08-03 20:09:44 +00:00
Sunny Goyal a659bfe3d2 Updating content description for the shortcuts menu and announcing
it when the container is opened

Bug: 30587453
Change-Id: I6f2d3ba05593f3e2a1a8f05c66a0f80e76932c38
2016-08-02 16:16:16 -07:00
Tony Wickham 0ba81607e3 Start shortcuts close animation where open left off.
- Before we always started the close animation at 0 instead of
  the previous open progress, which looked janky.
- Shortened the animations' durations and start delays to
  account for the fact that the open animation was only
  partially finished when the close animation started.

Bug: 30465231
Change-Id: I958ee5f4543dbf1185f3d0229c55fc1b51929655
2016-08-02 11:09:16 -07:00
Tony Wickham 55c6691e3a Add logging for shortcuts opening.
- Log as long press with child type DEEPSHORTCUTS container
- Parent type can be one of WORKSPACE, HOTSEAT, FOLDER,
  ALLAPPS, PREDICTION, or SEARCHRESULT.

Bug: 30537079
Change-Id: Ie62e4889ee06c845f959ca998781787a7fdaf00e
2016-08-01 17:55:07 -07:00
Tony Wickham 1460475626 Merge "Set shortcuts arrow pivot to side connected to container." into ub-launcher3-calgary 2016-07-30 00:04:14 +00:00
Tony Wickham 4d5887bd8c Set shortcuts arrow pivot to side connected to container.
Bug: 30508528
Change-Id: Iddc733d79b680010785d21b347d151bc23bffc23
2016-07-29 16:34:17 -07:00
Sunny Goyal 66d17ca32d Merge "Badging shortcuts with app icons" into ub-launcher3-calgary 2016-07-29 23:14:51 +00:00
Tony Wickham c39edf54e6 Filter shortcuts down to 4 if there are more.
- We take the first 4 in sorted order, except we remove up to 2
  static shortcuts to make room for dynamic ones if they exist.
- Added ShortcutFilterTest with testSortAndFilterShortcuts().
  This asserts that the filtered list is sorted and has the
  expected number of static and dynamic shortcuts based on
  inputs with various amounts of each.

Bug: 28980830
Change-Id: I832b6b21144f17c74bb8b90a840d6620e99911b8
2016-07-29 16:10:43 -07:00
Sunny Goyal 79cf718fcd Badging shortcuts with app icons
Change-Id: I3fa005ece20a54b31f823acb28c384ecdf1eafb1
2016-07-29 16:06:36 -07:00
Tony Wickham 6257bc327b Merge "Prevent opening shortcuts container if one is already open." into ub-launcher3-calgary 2016-07-29 01:14:22 +00:00
Tony Wickham c714c0148b Stop setting original icon visible when dragging app with shortcuts.
- This was leaving a "ghost" icon behind, which looked really weird.
- We still need to make it visible for All Apps, or else you can get
  in a state where the icon is gone from all apps indefinitely.

Bug: 30465972
Change-Id: I79eacf2dfdb0cd267732ae63ef69a9bb193933a5
2016-07-28 11:35:55 -07:00
Sunny Goyal a2454ad2d8 Launcher shortcuts animations update.
> The shortcut container closes with an animation
> When opening/closing the animation only the icon scales
and not the title and drag handle
> When dragging the icon, it starts from the original icon position and
moves under the user finger. The container grows to follow the drag view.

Bug: 28980830
Change-Id: Ic0353c30b682d1f018cbf4d62e8a6e8e7d7d4664
2016-07-27 17:37:23 -07:00
Tony Wickham 8141d63ed1 Prevent opening shortcuts container if one is already open.
Bug: 30245433
Change-Id: Id50f9e4b9ff40e1d1124caee537a07a594d6a790
2016-07-27 17:10:01 -07:00
Tony 780c926db5 Match updated redlines for shortcuts.
- Align shortcut icons with original icon.
- Drag handle is lighter and smaller.
- Shortcut pills are slightly wider to accommodate long text.

Bug: 28980830
Change-Id: I8e9709e3cbdb9df86a805a4b63a696975c61df5a
2016-07-26 17:54:02 -07:00
Tony eec1f9a839 Add arrow view to deep shortcuts container.
- We create a trangular path, which we use as the view's
  outline (for the shadow) and as its PathShape background.
- We scale up the arrow as the container opens.

Bug: 28980830
Change-Id: I71e566552f063dfdb69067bb7e3cee659988f934
2016-07-26 17:10:05 -07:00
Tony Wickham e9381d60cc Merge "Remove hover-to-launch gesture for shortcuts." into ub-launcher3-calgary 2016-07-26 23:11:08 +00:00
Tony Wickham bf0ee9a305 Remove hover-to-launch gesture for shortcuts.
- You can no longer long press and drag over shortcuts before
  lifting to launch them.
- Dragging in any direction past a threshold enters spring-loaded mode.

Bug: 28980830
Change-Id: I36bfc379cc983017456a3ef0314faa1ac9691c36
2016-07-26 15:55:11 -07:00
Sunny Goyal 984c260a98 Merge "Removing shadow and badging from the icon which is shown in the menu These are added as soon as the icon is added to the workspace" into ub-launcher3-calgary 2016-07-26 22:15:09 +00:00
Sunny Goyal 10923b30a2 Removing shadow and badging from the icon which is shown in the menu
These are added as soon as the icon is added to the workspace

Bug: 28980830
Change-Id: I725d2ee8994324f09d9ecf7bbbb0090a7ceb5769
2016-07-26 14:18:09 -07:00
Sunny Goyal c664f24de2 Merge "Fixing regression where the source icon becomes visible while dragging" into ub-launcher3-calgary 2016-07-26 17:20:25 +00:00
Sunny Goyal 3ffa64df36 Added custom actions for showing the shortcuts menu and adding a quick action
on the home screen

Bug: 30374655
Change-Id: I2f3ae31f2fb2c09f64f2a47e95a9d25435f7efe2
2016-07-25 17:39:34 -07:00
Sunny Goyal e6fd19b19f Fixing regression where the source icon becomes visible while dragging
Bug: 30291280
Change-Id: I5687e00371315a318e8ff93dd3de4c5f437a6971
2016-07-25 15:22:27 -07:00
Sunny Goyal b0e80bcee7 Fixing missed events during motion interaction
> Only ignoring touch events during the start of the motion events
> Handling action_cancel

Bug: 30291280
Change-Id: I4aa791b30c65ebaff90bb2f232d77de62ab6a033
2016-07-25 13:33:44 -07:00
Sunny Goyal 58368b1515 Merge "Increasing the size of the drag icon when a shortcut is dragged" into ub-launcher3-calgary 2016-07-22 17:47:50 +00:00
Sunny Goyal 157793dda4 Increasing the size of the drag icon when a shortcut is dragged
Change-Id: I7d768657300d3229e05d1eb18aec3720a9098ffc
2016-07-21 15:18:24 -07:00
Tony Wickham 3e97622d16 Fix deep shortcuts RTL issues.
- Container was shifted off screen.
- Touch down x coordinate was incorrect, causing the deferred
  drag to start immediately upon moving the original icon.

Bug: 30075428
Change-Id: I148b6f4f7945ecbcf67b52ba26a2af0065d8f538
2016-07-21 15:13:25 -07:00
Hyunyoung Song 5aa2714959 Add user event log for deep shortcuts and all apps opening interaction.
b/30114798

Change-Id: I11ad99d0bc1983294d6a5329b98917cb87250823
2016-07-21 11:48:37 -07:00
Tony Wickham 377ed3f63e Add drag handle to shortcuts.
Also use short text if long text is ellipsized.

Bug: 30212144
Bug: 28980830
Change-Id: I213766bca0561d284d1da883ca37b0a42d886129
2016-07-20 17:28:34 -07:00
Tony Wickham 8f58e61d02 Update shortcut animations.
- Open animation: shortcuts reveal using modified circular reveal
  (so that it reveals in the pill shape instead of a circle);
  slight translation away from the original icon; scale icon and text.
- Hover animation: scale the shortcut pill and translate others away.

Bug: 28980830
Bug: 30127368
Change-Id: I8ed05c7a082f2c2a3f6c663da7259f6cd33e394f
2016-07-19 13:58:51 -07:00
Tony Wickham 2c99d2ceeb Implement ranking for shortcuts.
- Manifest shortcuts are closest to the original icon, in rank order,
  followed by dynamic shortcuts in rank order.
- Also prevent pinned shortcuts from showing in container if they
  aren't also dynamic (only manifest and dynamic show in container).

Bug: 29822383
Bug: 29946657
Change-Id: I5cdb2ef3700daedca01987f64c245beb3f4aa5ee
2016-07-19 13:53:26 -07:00
Tony Wickham db19730e87 Use the shortcut's long label in the container, if it is available.
Bug: 28980830
Change-Id: Iefea0a7ee4be5bf45af14ce47abdd597f4137f92
2016-07-13 17:46:26 -07:00
Tony Wickham 7b8f1eaba1 Address comments on original shortcuts UI CL (ag/1061538).
- Only add shortcut touch listener to APPLICATION item types, not SHORTCUT.
- Load shortcuts on LauncherModel worker thread instead of using AsyncTask.
- Avoid a couple of unnecessary object allocations.

Change-Id: I31b911b91df71335542545602fe137e270c745d7
2016-07-13 14:47:58 -07:00
Tony Wickham 49c8d29fdd Close the shortcuts container in various places.
- Mostly everywhere folders are closed
- Implements DragListener so we can close the container when dragging
  the original icon or shortcuts from the container. We actually just
  hide the container in onDragStart() and really remove it in
  onDragEnd(). This avoids interfering with touch events and thus
  allows us to remove the hack of explicitly setting the DragLayer's
  controller when dragging shortcuts (since it will do it on intercept).

Bug: 30080537

Change-Id: Iccc2afba2a990a613bc588d57c4d8c1b7c65224b
2016-07-13 12:35:04 -07:00
Tony Wickham 2f2104ccdf Fix some issues with shortcut containers opened inside folders.
- Dragging a shortcut from a container inside a folder was buggy
  because the folder assumes that all drags are removing an item
  (so it marks the cell as unoccupied, etc.). So we just close
  the folder when dragging a shortcut.
- When the shortcuts container opened outside of a folder, touches
  on it were incercepted by DragLayer to close the folder. So we
  move the container intercept check first, and return false if the
  touch is over the container so it can handle the touch.

Change-Id: I8c5814513e99910b2930e05d9a62dfe0a0a60f3e
2016-06-30 16:34:20 -07:00
Tony Wickham 1bce7fd342 Long-press on an app to reveal its shortcuts.
- Add ShortcutsContainerListener to icons on workspace, folders, and
  all apps. This handles long-press and forwards following touches to
  the DeepShortcutsContainer that is created.
- Drag over shortcut before lifting finger to launch it.
- Shortcuts are rendered in pill-shaped DeepShortcutViews,
  which are inside DeepShortcutContainer on DragLayer.
- The shortcut container orients above or below the icon, and left or
  right-aligns with it. Biases for above + left-align.
- Long press a DeepShortcutPill to drag and pin it to the workspace.

Bug: 28980830
Change-Id: I08658d13ae51fe53064644e8d8f7b42f150fdd7d
2016-06-29 17:48:46 -07:00