1e4420c4ab
[automerger] Using dragHandle for workspace padding calculation instead of pageIndicator am: 08ef66789b
...
Change-Id: If1cee04dcd365d87328119ccec457c30c0fb317d
2018-05-10 18:33:17 +00:00
08ef66789b
Using dragHandle for workspace padding calculation instead of pageIndicator
...
> PageIndicator is a 1dp indicator which does not contribute in any padding calculations
Bug: 79111591
Change-Id: I4d8be0149da2b3f14593ae71ca037ffe3885d9be
2018-05-10 11:33:11 -07:00
54e5da53e5
[automerger] Removing scrim overdraw am: 5d1873a812
...
Change-Id: I4028fc2605b182f3a723efa5e2f547018f580130
2018-05-10 17:52:37 +00:00
5d1873a812
Removing scrim overdraw
...
> Moving all the scrims to draglayer to avoid creating multiple layers during
various animations
> Removing sys-ui scrim in various states which alread have a background scrim
Bug: 74556464
Bug: 78585335
Change-Id: I8a3fd34ed440f3c7d2e19b3cdb4b72723c535602
2018-05-10 10:52:31 -07:00
54e09b2673
Merge changes from topic "am-11851312-e665-4de2-88e4-10cb14f31d5f" into ub-launcher3-master
...
* changes:
[automerger] Fix lock contention while swiping up am: 570432f700
2018-05-10 17:42:52 +00:00
522e388b17
Merge "Fix lock contention while swiping up" into ub-launcher3-edmonton
2018-05-10 17:42:52 +00:00
b7ba11a3c8
Merge changes from topic "am-b221aa51-527b-4bc6-ba9b-bb560e5f8d73" into ub-launcher3-master
...
* changes:
[automerger] Removing extra binder call on state or visibility change am: 6b4b9b5d71
2018-05-10 17:40:32 +00:00
e97bbc47b8
Merge "Removing extra binder call on state or visibility change" into ub-launcher3-edmonton
2018-05-10 17:40:32 +00:00
8eb2da78f2
[automerger] Don't reapply state when setting user controlled animation am: d4ece9a74c
...
Change-Id: I1123e91a4940d482173c739f4133e9c103914377
2018-05-10 17:04:08 +00:00
d4ece9a74c
Don't reapply state when setting user controlled animation
...
Bug: 79525106
Change-Id: Ia41a51559196d4aa657fae47727c7366d9073295
2018-05-10 10:03:54 -07:00
ff94b044cf
Show discovery bounce after work profile is created
...
BUG: 72804698
Change-Id: Ifa59ed5d82d12eb65323e86af9c8db2c3e9920a3
2018-05-10 16:52:15 +01:00
cc0453c5e0
Merge "Fixing disabled filter is not applied to the foregound layer when dragging an icon" into ub-launcher3-edmonton
2018-05-10 06:52:02 +00:00
0a71ee4e53
Merge changes from topic "am-b652fda1-3023-4149-b53e-2532167ad664" into ub-launcher3-master
...
* changes:
[automerger] Fixing disabled filter is not applied to the foregound layer when dragging an icon am: b6d292d788
2018-05-10 06:52:02 +00:00
637a6355c6
Merge "More detailed description for shortcuts_menu_with_notifications_description" into ub-launcher3-edmonton
2018-05-10 01:09:27 +00:00
f4267ff9d2
[automerger] More detailed description for shortcuts_menu_with_notifications_description am: 21837e5d24
...
Change-Id: I5faca66455d6f3d3c8d809fbb1821844a1f66885
2018-05-10 00:59:19 +00:00
21837e5d24
More detailed description for shortcuts_menu_with_notifications_description
...
Change-Id: I5e4a416ae7e45863ac9e6a719dfbf5de1741d5a1
Testing: Manual
Bug: 79490700
2018-05-09 17:58:52 -07:00
2d90fd0eeb
Merge "Use device api level if first_api_level is not set. Bug: 79429532" into ub-launcher3-edmonton
2018-05-09 23:41:05 +00:00
35d11c9e01
Merge changes from topic "am-b2ecfae0-2b56-4c12-a902-81d99b089bfe" into ub-launcher3-master
...
* changes:
[automerger] Use device api level if first_api_level is not set. Bug: 79429532 am: a30bf371e4
2018-05-09 23:41:05 +00:00
788003e4bf
Merge "Tune discovery bounce to be more gentle when bouncing." into ub-launcher3-edmonton
2018-05-09 23:26:01 +00:00
33eefb2e00
[automerger] Tune discovery bounce to be more gentle when bouncing. am: 6c4fa1045b
...
Change-Id: I6b787074324ca06ab03bafb842f4683a634a723a
2018-05-09 23:18:45 +00:00
6c4fa1045b
Tune discovery bounce to be more gentle when bouncing.
...
Change-Id: I6b1c094bbcd07bfda76bcc2c6b2a6fb249acd377
Fixes: 79491740
Test: Manual test
2018-05-09 23:18:44 +00:00
7a4dfc9885
Merge "Improve animation when swiping down on task" into ub-launcher3-edmonton
2018-05-09 23:14:34 +00:00
4d9ee66eff
Merge changes from topic "am-7b19da77-0ec2-4e05-be44-de816e5aee8c" into ub-launcher3-master
...
* changes:
[automerger] Improve animation when swiping down on task am: b271ad8972
2018-05-09 23:14:34 +00:00
56cbbcbe70
[automerger] Fixing disabled filter is not applied to the foregound layer when dragging an icon am: b6d292d788
...
Change-Id: I790b1e856eb57f4678c30cd0d60ed7967f3c46c1
2018-05-09 21:25:16 +00:00
b6d292d788
Fixing disabled filter is not applied to the foregound layer when dragging an icon
...
Bug: 79475381
Change-Id: Ic489601f80a3180fe20a83988c2c3db7100e6946
2018-05-09 14:25:09 -07:00
47295ded48
[automerger] Fix lock contention while swiping up am: 570432f700
...
Change-Id: Ib7c958814612afd4104d1ad551f2644bed4a3547
2018-05-09 21:12:52 +00:00
570432f700
Fix lock contention while swiping up
...
- Don't lock when making WM calls (only lock when resetting), and use own
executor since the background executor is fixed to only two threads and
other things can be running on them already (like task loading).
Bug: 78585335
Change-Id: I73dfc380dd99908cfc30ff7c164a9677a5a126e0
2018-05-09 14:10:52 -07:00
5be4075727
Merge "Don't end atomic animation when passing through state" into ub-launcher3-edmonton
2018-05-09 20:26:46 +00:00
37b4fe8930
Merge changes from topic "am-f87bd580-30d6-4da0-89bd-1568b32fd0ac" into ub-launcher3-master
...
* changes:
[automerger] Don't end atomic animation when passing through state am: fc564f1477
2018-05-09 20:26:46 +00:00
56b247da1d
Merge "Add atomic recents animation while swiping up" into ub-launcher3-edmonton
2018-05-09 20:13:23 +00:00
b323baf20a
Merge changes from topic "am-65c635f5-fb28-44c1-966a-528663e0dfb3" into ub-launcher3-master
...
* changes:
[automerger] Add atomic recents animation while swiping up am: 6becf7c07d
2018-05-09 20:13:23 +00:00
ca94564c4f
[automerger] Use device api level if first_api_level is not set. Bug: 79429532 am: a30bf371e4
...
Change-Id: I12fcd4af04e1e5f3a33cae0b748b05222bd499db
2018-05-09 20:13:06 +00:00
f69f0c2bf0
Merge "Adding a carent in the scrim" into ub-launcher3-edmonton
2018-05-09 20:12:59 +00:00
ae59144edb
Merge changes from topic "new-caret" into ub-launcher3-master
...
* changes:
[automerger] Adding a carent in the scrim am: ef39540dde
2018-05-09 20:12:59 +00:00
a30bf371e4
Use device api level if first_api_level is not set.
...
Bug: 79429532
Change-Id: I2fddad81fb1cd23d4023d7f3f5124f14a8c994f7
2018-05-09 13:12:48 -07:00
8473ddb7ee
Merge "Tweaks to app closing animation." into ub-launcher3-edmonton
2018-05-09 20:11:23 +00:00
927a4083f9
Merge changes from topic "am-30df34fa-07f8-4f02-9c82-1165138e504b" into ub-launcher3-master
...
* changes:
[automerger] Tweaks to app closing animation. am: d26d5aaa6d
2018-05-09 20:11:23 +00:00
0d05a8b311
Merge "Revert "Fix lock contention while swiping up"" into ub-launcher3-edmonton
2018-05-09 20:11:22 +00:00
534453ab0b
[automerger] Revert "Fix lock contention while swiping up" am: daa47e7ccc
...
Change-Id: I66584ddff364de3ca11bf1a5941a3436f2bd0002
2018-05-09 20:10:41 +00:00
daa47e7ccc
Revert "Fix lock contention while swiping up"
...
This reverts commit 12c4ecb015
2018-05-09 20:10:40 +00:00
d3e55f1b64
Merge "Fix lock contention while swiping up" into ub-launcher3-edmonton
2018-05-09 20:07:44 +00:00
a75a3a3f75
[automerger] Fix lock contention while swiping up am: 12c4ecb015
...
Change-Id: I4534687bc96a71e60c1e8ee3c0cc3ed92c65349c
2018-05-09 19:52:03 +00:00
6ea60b8332
[automerger] Tweaks to app closing animation. am: d26d5aaa6d
...
Change-Id: Ia50af519ece522ea781d027af5f2dddb1095475e
2018-05-09 19:51:49 +00:00
d26d5aaa6d
Tweaks to app closing animation.
...
Change-Id: Ia2cbc1401a57ad8dc3e3553110497eb35c19fe64
2018-05-09 12:51:34 -07:00
12c4ecb015
Fix lock contention while swiping up
...
- Don't lock when making WM calls (only lock when resetting), and use own
executor since the background executor is fixed to only two threads and
other things can be running on them already (like task loading).
Bug: 78585335
Change-Id: I56e24fbbdeb3b673837982df3fa67e485d03b3b2
2018-05-09 12:51:02 -07:00
e474f14f65
[automerger] Adding a carent in the scrim am: ef39540dde
...
Change-Id: I0d0e3bd2c24559b93bd7d5b4e23833b1dd9921e8
2018-05-09 19:39:35 +00:00
ef39540dde
Adding a carent in the scrim
...
> Caret is only visible when the accessibility is enabled
> It is visible in NOTMAL and OVERVIEW state and moves out of the
scrim along with the scrim.
> Acts as an accessible target for various options
Bug: 78172350
Bug: 79215734
Change-Id: I8a968b67e36901859649546295f6491d49cc9ce9
2018-05-09 12:39:30 -07:00
d21fc0cddc
[automerger] Don't end atomic animation when passing through state am: fc564f1477
...
Change-Id: I1ac067e008a8db4abbae7a246f080949c1a47be0
2018-05-09 19:36:11 +00:00
fc564f1477
Don't end atomic animation when passing through state
...
Previously we were ending the atomic animation with the assumption
that it should be complete/almost complete by the time you drag to
the next state. However, it is very easy to drag quickly enough where
that assumption doesn't hold, and thus you just see the atomic
animation pop to the end (i.e. recents showing without animation).
Now instead of ending the atomic animation, we let it continue. But
because the new state animation will have an atomic component that
interferes with the still playing atomic animation, we have to
control the atomic component separately; we control the non-atomic
components until the atomic animation ends, at which point we create
a separate controller to control the atomic components.
Bug: 76449024
Change-Id: Ia4bf19e26d0838f952d9e500fbdd8aba19856a41
2018-05-09 12:36:02 -07:00
6c32ec83fb
[automerger] Add atomic recents animation while swiping up am: 6becf7c07d
...
Change-Id: Ib721a3c578112102ccfa487f8f63da6b175276a2
2018-05-09 19:33:57 +00:00
Android Build Merger (Role)