Commit Graph
12692 Commits
Author SHA1 Message Date
Tony 8c855cb8c0 Don't attempt to add item back to folder when deferring drag.
am: 1cf412ca91

Change-Id: Ic8bf5568b9811558bf20fac721b17dfa80803e8a
2016-09-26 20:59:51 +00:00
Tony 5eea1e89dd resolve merge conflicts of 6e74e89 to ub-launcher3-master
Change-Id: I34e449ca3a91ee06e1983ac3a83cb7ca53567a91
2016-09-23 19:43:35 -07:00
Tony 1cf412ca91 Don't attempt to add item back to folder when deferring drag.
Since the item hasn't yet been removed until the deferred drag
starts, adding it again will throw an exception (the view
already has a parent).

Bug: 30769920
Change-Id: Icb95aaa64e6e3c5dc105bbf3e54460b529d02033
2016-09-23 18:58:37 -07:00
Tony Wickham 6e74e899d3 Refactor shortcuts drag and drop.
- Instead of creating our own drag view within the container, and
  handling logic to determine when to start a real drag, we start
  the drag immediately and just defer onDragStart().
- To determine when the deferred drag should start, we add a
  DeferDragCondition to DragOptions. The default DeferDragCondition
  never defers a drag, but is overridden for apps with shortcuts
  to defer until the icon is dragged a given distance.
- Because the drag is handled in DragController, including checking
  when to start the deferred drag, DeepShortcutsContainer no longer
  needs to handle touch events and ShortcutsContainerListener has
  been removed.

This change has several immediate benefits:
- The code is much cleaner, because it allows touch handling to be
  done by the DragController through the normal drag flow, without
  recreating logic in ShortcutsContainerListener/DeepShortcutContainer.
- The janky second haptic feedback has been removed (now it vibrates
  when you long press, like everywhere else, but not again when the
  shortcuts close after dragging a distance).
- Drops are animated, instead of just popping the icon back into place.

Bug: 30769920
Bug: 30465972
Bug: 31533078
Change-Id: I679b412b72fbf6c3895d76963311eb5010c8e8db
2016-09-23 18:44:47 -07:00
Jonathan Miranda 20eedeb5ae Merge "Move handling touch logic from AllAppsContainerView to BaseContainerView." into ub-launcher3-master 2016-09-23 23:44:31 +00:00
Sunny Goyal c2f72b0bb8 Merge "Resize only one widget at a time" into ub-launcher3-master 2016-09-23 23:23:03 +00:00
Sunny Goyal 6ad72f02fd Resize only one widget at a time
> Removing logic to have multiple widgets in resize mode
> Making ResizeFrame a touch controller, so that it fits well with
other touch interaction in drag layer
> Chaning the method names in touch controller, so that it do not
overlaps with the default View methods

Change-Id: I85d4dbdfc82d078781adbce137dfaaea59c9c83d
2016-09-23 16:02:49 -07:00
Sunny Goyal a18d50fd3b Removing center vertical from folder gravity.
am: 00341907b7

Change-Id: I436d3577f03dc4178a72e52bd49853c417c3d314
2016-09-23 17:42:56 +00:00
Sunny Goyal 00341907b7 Removing center vertical from folder gravity.
Using center vertical alogn with a fixed height, overrides
the custom drawable padding and divides the available space
proportionally between padding and drawable padding

Change-Id: I4523543ab3007ef40eac69d878d2afbca13b483a
2016-09-23 10:23:20 -07:00
Jon Miranda 3298d0ff9b Move handling touch logic from AllAppsContainerView to BaseContainerView.
Now both AllAppsContainerView and WidgetsContainerView will be
dismissed when the background is clicked.

Bug: 27130340
Change-Id: Ie8446e4b8908742ddc8a227fe71ea56ec11c2457
2016-09-22 18:39:29 -07:00
Tony Wickham b3cc0f1b19 Merge "Stop jumping to workspace from hotseat on quick drop." into ub-launcher3-calgary-polish
am: c980735560

Change-Id: Ief6ebc05301a56cf56a72acc433f9ee4a2e60fb3
2016-09-23 00:37:14 +00:00
Tony Wickham a07b9335e4 Stop jumping to workspace from hotseat on quick drop.
am: dbf08b4aee

Change-Id: Id1a4c65f14810dcf3e6534796d797603070c5d68
2016-09-23 00:37:12 +00:00
Tony Wickham b3615ae837 Merge "Remove shortcuts that no longer exist or are no longer pinned." into ub-launcher3-calgary-polish
am: 39ce3d119b

Change-Id: I04ac79eaf01c0257633e06c64f572a68ab21df87
2016-09-23 00:35:14 +00:00
Tony Wickham 8177ac7f88 Remove shortcuts that no longer exist or are no longer pinned.
am: 7695e603bf

Change-Id: I525c3342a7559f1cd831cbd4f56c2acd8b6875b9
2016-09-23 00:35:13 +00:00
Tony Wickham c980735560 Merge "Stop jumping to workspace from hotseat on quick drop." into ub-launcher3-calgary-polish 2016-09-23 00:34:53 +00:00
Tony Wickham 39ce3d119b Merge "Remove shortcuts that no longer exist or are no longer pinned." into ub-launcher3-calgary-polish 2016-09-23 00:32:22 +00:00
Tony Wickham 7695e603bf Remove shortcuts that no longer exist or are no longer pinned.
(This change is in the onShortcutsChanged() callback.)

- Remove all workspace icons that correspond to shortcuts that
  are now unpinned
- Remove all workspace icons that have the same package and
  user handle as passed in onShortcutsChanged(), if they aren't
  included in the list of shortcuts that is also passed.

These cases will happen for static and dynamic shortcuts,
respectively, when an app's data is cleared.

Bug: 30316501
Change-Id: I50db6567cb318d087012ab5d8208e765b81c6f99
2016-09-22 16:54:57 -07:00
Tony Wickham f2e075133e Move shortcut fade interpolator outside of loop.
am: e5a00c6172

Change-Id: I7b2c15b04a7656b136f5d6f0c54f13030c5b9563
2016-09-22 21:09:19 +00:00
Tony Wickham 99fed5fa07 Merge "Fade deep shorcuts in and out." into ub-launcher3-calgary-polish
am: 4d917a9793

Change-Id: I3e6d8d1e8e74c31bffb166f72d3e3e87f017ffea
2016-09-22 20:08:42 +00:00
Tony Wickham af86c004d2 Fade deep shorcuts in and out.
am: b318c0e396

Change-Id: Ib31d1878822ec42ad8fdfcfd78636ea4b2472cae
2016-09-22 20:08:40 +00:00
Tony Wickham e5a00c6172 Move shortcut fade interpolator outside of loop.
Change-Id: I64806897afcd1062dfbaefd6dca07f024f7346af
2016-09-22 13:01:46 -07:00
Tony Wickham 4d917a9793 Merge "Fade deep shorcuts in and out." into ub-launcher3-calgary-polish 2016-09-22 19:55:52 +00:00
Tony Wickham b318c0e396 Fade deep shorcuts in and out.
Animate open:
- Stagger-fade shortcuts as they open
- Become fully opaque before fully open, at which point the
  arrow animates in (scale). This way there is no overlap of
  a translucent shortcut over an opaque arrow.

Animate close:
- Stagger-fade shortcuts as they close
- Delay fade until arrow animation is finished, to ensure
  there is no overlapping of translucent and opaque.

This is much less visually jarring when quickly dragging
and dropping apps with shortcuts.

Bug: 31533078
Change-Id: I8673ee64e92414c718233ea89b70362187e53696
2016-09-22 12:50:58 -07:00
Jonathan Miranda 5fbbb172c8 Merge "Move TransformingTouchDelegate logic to BaseContainerView." into ub-launcher3-master 2016-09-22 19:22:50 +00:00
Hyunyoung Song cb2295a0b0 Merge "Fixing two critical bugs in all apps transition controller" into ub-launcher3-calgary am: b7d16b7e5c
am: f4502973cc

Change-Id: I5ff208db9d23b5348aa88015650c962278aaf49b
2016-09-22 18:24:23 +00:00
Hyunyoung Song f4502973cc Merge "Fixing two critical bugs in all apps transition controller" into ub-launcher3-calgary
am: b7d16b7e5c

Change-Id: I95a6bfc2247eb98d5c3758589989bcaf2657e072
2016-09-22 18:21:53 +00:00
Hyunyoung Song f851b1af5b Fixing two critical bugs in all apps transition controller am: 0a9c092c89
am: ea045e7532

Change-Id: I64a1d4620427d4c7d9dcb67a27dc07fb1f5aa03b
2016-09-22 18:20:54 +00:00
Hyunyoung Song ea045e7532 Fixing two critical bugs in all apps transition controller
am: 0a9c092c89

Change-Id: I115b7bc6d165dc9d5e73e1878b96d194bfc62da7
2016-09-22 18:17:25 +00:00
Jon Miranda 177ad2bf89 Move TransformingTouchDelegate logic to BaseContainerView.
In ag/1460444 we used TransformingTouchDelegate to extend the
touch target for the widgets list. Now both WidgetsContainerView
and AllAppsContainerView will use the same TransformingTouchDelegate logic
to extend the touch target for their respective lists.

This is part of a larger refactor where in a follow up CL, we will
handle the logic for dismissing WCV and AACV when touching outside
of its content in BaseContainerView. (currently broken in WCV).

Change-Id: I7fddb456bba34a6533f8824da0481d308a8b715e
2016-09-22 10:39:29 -07:00
Hyunyoung Song b7d16b7e5c Merge "Fixing two critical bugs in all apps transition controller" into ub-launcher3-calgary 2016-09-22 17:36:40 +00:00
Bill Yi dc733b2c07 Merge "Import translations. DO NOT MERGE" into ub-launcher3-calgary-polish
am: abb607fc9b  -s ours

Change-Id: Ie324250d9e2f2fab6b2557e1122e9065f96067d1
2016-09-22 09:56:31 +00:00
Bill Yi 0baea722ef Import translations. DO NOT MERGE
am: 0fe66d46ae  -s ours

Change-Id: I1893eda4c98c2f8c1e88344b026ea94819654b47
2016-09-22 09:56:30 +00:00
TreeHugger Robot abb607fc9b Merge "Import translations. DO NOT MERGE" into ub-launcher3-calgary-polish 2016-09-22 09:53:25 +00:00
TreeHugger Robot 383f86836a Merge "Import translations. DO NOT MERGE" into ub-launcher3-master 2016-09-22 09:52:46 +00:00
Bill Yi a981886821 Import translations. DO NOT MERGE
Change-Id: I343b48a459a76f8095562da1d4e6b06ec58acb37
Auto-generated-cl: translation import
2016-09-22 00:18:16 -07:00
Bill Yi 0fe66d46ae Import translations. DO NOT MERGE
Change-Id: Idd135c03ff2a6ff9d08ca6c4e9e5ec6ae1520efa
Auto-generated-cl: translation import
2016-09-22 00:17:47 -07:00
Hyunyoung Song 5fc2f9928e Merge "Make IME less sticky when launching a new app b/31382106" into ub-launcher3-calgary-polish
am: 1c8c3c1f05

Change-Id: Icbb7207443592d97922cfeeab384e83ee0b8e019
2016-09-22 00:30:50 +00:00
Hyunyoung Song 2cc3d6647b Make IME less sticky when launching a new app b/31382106
am: 7e83ab90ae

Change-Id: I1f3fac72ce6ba14ea0c116f71f398ff2727469af
2016-09-22 00:30:49 +00:00
Hyunyoung Song 1c8c3c1f05 Merge "Make IME less sticky when launching a new app b/31382106" into ub-launcher3-calgary-polish 2016-09-22 00:10:56 +00:00
Hyunyoung Song 7e83ab90ae Make IME less sticky when launching a new app
b/31382106

Change-Id: Iee60a2f7e6a70858623e80d4b8b68154d1941210
2016-09-21 17:03:56 -07:00
Shankhoneer Chakrovarty b836dc3384 Merge "Created include filters for jacoco" into ub-launcher3-calgary am: d6925a9f70
am: 98c7c2fc80

Change-Id: Iff4f4e0648251fbc3823c0d3bf079ee2824f0e56
2016-09-21 19:55:58 +00:00
Shankhoneer Chakrovarty 56b7f276a3 Created include filters for jacoco am: 687c345f9e
am: 62f55c0d1a

Change-Id: Ie6d60eb3bc8623e3fdd607a41f26fc8f43f61242
2016-09-21 19:55:50 +00:00
Shankhoneer Chakrovarty 98c7c2fc80 Merge "Created include filters for jacoco" into ub-launcher3-calgary
am: d6925a9f70

Change-Id: I163101ef0a64eb38e47597db49b644290d5bb3c3
2016-09-21 19:53:20 +00:00
Shankhoneer Chakrovarty 62f55c0d1a Created include filters for jacoco
am: 687c345f9e

Change-Id: Iba826f45c2a0c0d5952090d2f454f18c7534403d
2016-09-21 19:53:20 +00:00
Shankhoneer Chakrovarty d6925a9f70 Merge "Created include filters for jacoco" into ub-launcher3-calgary 2016-09-21 19:47:05 +00:00
Hyunyoung Song 0a9c092c89 Fixing two critical bugs in all apps transition controller
bug#1: if long press from page indicator region, you can pull up all apps
even though the workspace is in overview state.

bug#2: all apps should not intercept touch not only in overview mode
but also in any modal state.

Change-Id: I91c0a181f037f6c2465a983825da3a2da7e2920f
2016-09-20 22:50:06 -07:00
Tony Wickham dbf08b4aee Stop jumping to workspace from hotseat on quick drop.
Regression occurred in ag/1315317.

In that change, Launcher#enterSpringLoadedDragMode() was moved from
the end of startDrag() to the end of onDragStart(). This changed the
sequence of events from:

beginDragShared() --> DragController#startDrag() --> onDragStart -->
dropTarget.onDragOver() --> Launcher#enterSpringLoadedDragMode()

to:

beginDragShared() --> DragController#startDrag() --> onDragStart -->
Launcher#enterSpringLoadedDragMode() --> onDragOver()

Basically, the key difference is that onDragOver() is called after
enterSpringLoadedDragMode(). This matters, because onDragOver()
returns early if Workspace#transitionStateShouldAllowDrop() returns
false, which it does during the spring loaded transition. This meant
that onDragOver() didn't update the layout to be Hotseat, and thus
the current workspace page was used as default, since that is what
was set in onDragEnter(). To fix it, I've copied the logic in
onDragOver() that checks to see if the drag is over the hotseat first
to a new method that onDragEnter() now calls as well.

Bug: 31245181
Change-Id: Ie758921b25fc96516a09c32bdc9706da941522df
2016-09-20 16:48:42 -07:00
Hyunyoung Song f09bfab404 Merge "Fix ExtendedEditText not handling touch correctly b/31555902" into ub-launcher3-calgary-polish
am: 13c14c8f8c

Change-Id: I6dfc939480c54909e34e5ae6747bd22e86fa5368
2016-09-20 21:50:27 +00:00
Hyunyoung Song c7be9c576e Fix ExtendedEditText not handling touch correctly b/31555902
am: 3f9d647de6

Change-Id: I8222f4f386f3322d167bce070070bf473685d789
2016-09-20 21:50:26 +00:00
Hyunyoung Song 13c14c8f8c Merge "Fix ExtendedEditText not handling touch correctly b/31555902" into ub-launcher3-calgary-polish 2016-09-20 21:10:35 +00:00