Commit Graph
78507 Commits
Author SHA1 Message Date
Android Build Merger (Role) 6d75448fdb [automerger] Update displacement on ACTION_UP as well, in case ACTION_UP and came in a different frame than last ACTION_MOVE am: ab66067def
Change-Id: Id8ff4d88a399ef4e45805a3b8bbc4fe18064bb17
2018-05-29 22:55:06 +00:00
Sunny Goyal ab66067def Update displacement on ACTION_UP as well, in case ACTION_UP and came in a different frame
than last ACTION_MOVE

Bug: 80292740
Change-Id: Ie75ac3ebb74024073965a7455a6503e8ed3f6d99
2018-05-29 15:54:59 -07:00
Tony Wickham 78bf9b6265 Merge changes from topic "am-44d997ce-f83c-4bd7-aee0-6ab74e7269f5" into ub-launcher3-master
* changes:
  [automerger] Unhide badge when popup closes without animation am: bb9378aead am: d7eaf26425
  [automerger] Unhide badge when popup closes without animation am: bb9378aead
  Unhide badge when popup closes without animation
2018-05-29 22:44:10 +00:00
Tony Wickham 2daafb6813 Merge changes from topic "am-44d997ce-f83c-4bd7-aee0-6ab74e7269f5" into ub-launcher3-edmonton-polish
* changes:
  [automerger] Unhide badge when popup closes without animation am: bb9378aead
  Unhide badge when popup closes without animation
2018-05-29 22:44:10 +00:00
Tony Wickham 0512a6de57 Merge "Unhide badge when popup closes without animation" into ub-launcher3-edmonton 2018-05-29 22:44:09 +00:00
Treehugger Robot 1179b71480 Merge "Fixing wrong xml refenrece when the packageName is changed" 2018-05-29 22:23:42 +00:00
Tony Wickham bc72fb2376 Merge changes from topic "am-125d8586-dd81-455b-b3e8-107829f04796" into ub-launcher3-master
* changes:
  [automerger] Set mState = mCurrentStableState in onAnimationCancel am: 8935d9515c am: 556a97d9d6
  [automerger] Set mState = mCurrentStableState in onAnimationCancel am: 8935d9515c
  Set mState = mCurrentStableState in onAnimationCancel
2018-05-29 22:16:05 +00:00
Tony Wickham ed37da8596 Merge changes from topic "am-125d8586-dd81-455b-b3e8-107829f04796" into ub-launcher3-edmonton-polish
* changes:
  [automerger] Set mState = mCurrentStableState in onAnimationCancel am: 8935d9515c
  Set mState = mCurrentStableState in onAnimationCancel
2018-05-29 22:16:05 +00:00
Tony Wickham ad361780fe Merge "Set mState = mCurrentStableState in onAnimationCancel" into ub-launcher3-edmonton 2018-05-29 22:16:05 +00:00
TreeHugger Robot 298f29d84f Merge changes from topic "am-4b8e4c1e-4bcf-4005-a8fa-209b8b48e653" into ub-launcher3-master
* changes:
  [automerger] Accounting for one frame jump when starting a fling animation am: 9c3f172d9c am: 4205b54ca8
  [automerger] Accounting for one frame jump when starting a fling animation am: 9c3f172d9c
  Accounting for one frame jump when starting a fling animation
2018-05-29 22:07:55 +00:00
TreeHugger Robot 5ec7fbd340 Merge changes from topic "am-4b8e4c1e-4bcf-4005-a8fa-209b8b48e653" into ub-launcher3-edmonton-polish
* changes:
  [automerger] Accounting for one frame jump when starting a fling animation am: 9c3f172d9c
  Accounting for one frame jump when starting a fling animation
2018-05-29 22:07:55 +00:00
TreeHugger Robot ad85852cc0 Merge "Accounting for one frame jump when starting a fling animation" into ub-launcher3-edmonton 2018-05-29 22:07:55 +00:00
Android Build Merger (Role) 4cd3f2280c [automerger] Set mState = mCurrentStableState in onAnimationCancel am: 8935d9515c am: 556a97d9d6
Change-Id: I5de9060970fe6f8cb87f45d2e27ec591c4db543c
2018-05-29 22:03:17 +00:00
Android Build Merger (Role) 556a97d9d6 [automerger] Set mState = mCurrentStableState in onAnimationCancel am: 8935d9515c
Change-Id: Ib02a0b19494b8c71576145dc1bd9d45dfd36c399
2018-05-29 22:03:16 +00:00
Tony Wickham 8935d9515c Set mState = mCurrentStableState in onAnimationCancel
mState is set when the transition starts toward that state even if it is
never reached. If the animation is canceled, therefore, we should reset
mState = mCurrentStableState since that is the state we came from.

For instance, when swiping up from overview, mState = ALL_APPS, but when
swiping back down we cancel that animation and create the task launch
animation. When creating the task launch animation, we reapplyState(),
which, before this change, was still ALL_APPS instead of OVERVIEW.

Bug: 79935289
Change-Id: I59c5799e92350747e4ef1d99a80ba678a2ce7b98
2018-05-29 21:58:52 +00:00
Android Build Merger (Role) b052aabc6e [automerger] Unhide badge when popup closes without animation am: bb9378aead am: d7eaf26425
Change-Id: I879d3e174ebad674893d02f674254675e56e7aeb
2018-05-29 21:46:15 +00:00
Android Build Merger (Role) d7eaf26425 [automerger] Unhide badge when popup closes without animation am: bb9378aead
Change-Id: Ib3e8bc6622e74c9a7ca214cfabecac956b666397
2018-05-29 21:46:13 +00:00
Tony bb9378aead Unhide badge when popup closes without animation
Bug: 80379412
Change-Id: I7d6c1b67a07747078b43b17612d8c67a46c8cc0e
2018-05-29 14:44:41 -07:00
TreeHugger Robot eaf8df5d15 Merge changes from topic "am-0b3e8005-2f86-464c-a098-80fe1bc17072" into ub-launcher3-master
* changes:
  [automerger] Enable accessibility of Clear All button. am: a3e48d8035 am: 6ad288f99b
  [automerger] Enable accessibility of Clear All button. am: a3e48d8035
  Enable accessibility of Clear All button.
2018-05-29 20:48:47 +00:00
TreeHugger Robot d715070fe8 Merge changes from topic "am-0b3e8005-2f86-464c-a098-80fe1bc17072" into ub-launcher3-edmonton-polish
* changes:
  [automerger] Enable accessibility of Clear All button. am: a3e48d8035
  Enable accessibility of Clear All button.
2018-05-29 20:48:47 +00:00
TreeHugger Robot 688701317a Merge "Enable accessibility of Clear All button." into ub-launcher3-edmonton 2018-05-29 20:48:47 +00:00
Android Build Merger (Role) e7a938518a [automerger] Accounting for one frame jump when starting a fling animation am: 9c3f172d9c am: 4205b54ca8
Change-Id: Ib7ed3d4bd38f901f9330db9800faf3d4eab31b73
2018-05-29 20:39:13 +00:00
Android Build Merger (Role) 4205b54ca8 [automerger] Accounting for one frame jump when starting a fling animation am: 9c3f172d9c
Change-Id: Ic557cf266e8de2a1fc37eb98dc00766f148b5123
2018-05-29 20:39:10 +00:00
Sunny Goyal 9c3f172d9c Accounting for one frame jump when starting a fling animation
Bug: 80292740
Change-Id: I47bca071d42d1d217068c128f9793e87210d0286
2018-05-29 13:38:57 -07:00
Colin Cross 7ff0d582e1 Revert "Default to AAPT2 = false in AOSP only"
I276d22e82dbef65eaa0f6c3331d7990292a62bc9 fixes the underlying
issue that was causing Launcher to crash when building with aapt2.

This reverts commit 0838a7d416.

Bug: 80404630
Test: booted and launcher didn't crash
Change-Id: I77e231b000e7c05a631bc44271c203dd698b6873
Merged-In: I2edc3c9ba8e3e7616ea39c4ebf1fe6e65f113090
2018-05-29 13:23:21 -07:00
Sunny Goyal 8d3070f5cf Fixing wrong xml refenrece when the packageName is changed
Test: none
Change-Id: I276d22e82dbef65eaa0f6c3331d7990292a62bc9
Merged-In: I276d22e82dbef65eaa0f6c3331d7990292a62bc9
(cherry picked from commit 3cf2d5093f)
2018-05-29 13:23:17 -07:00
Tony Wickham 5229456b6d Merge changes from topic "am-e25a8740-226a-4af9-b60d-f299bd4a3297" into ub-launcher3-master
* changes:
  [automerger] Fix clipping recents when scaling down am: 615ad40c38 am: 7f510c5886
  [automerger] Fix clipping recents when scaling down am: 615ad40c38
  Fix clipping recents when scaling down
2018-05-29 19:33:24 +00:00
Tony Wickham 563a820a16 Merge changes from topic "am-e25a8740-226a-4af9-b60d-f299bd4a3297" into ub-launcher3-edmonton-polish
* changes:
  [automerger] Fix clipping recents when scaling down am: 615ad40c38
  Fix clipping recents when scaling down
2018-05-29 19:33:24 +00:00
Tony Wickham 222d517c89 Merge "Fix clipping recents when scaling down" into ub-launcher3-edmonton 2018-05-29 19:33:24 +00:00
TreeHugger Robot 038338d214 Merge "Various quickscrub fixes" into ub-launcher3-edmonton 2018-05-29 19:26:07 +00:00
Android Build Merger (Role) 1d9a44748a [automerger] Various quickscrub fixes am: 9bb8ffb5e3 am: c7bf48338c
Change-Id: I2ed6d0318a36148bf177108d3d2c21506644d33f
2018-05-29 19:17:28 +00:00
Android Build Merger (Role) c7bf48338c [automerger] Various quickscrub fixes am: 9bb8ffb5e3
Change-Id: Id9f1cb83795b3164dd8bc67c879a3b3d8b8fd91f
2018-05-29 19:17:26 +00:00
Sunny Goyal 9bb8ffb5e3 Various quickscrub fixes
> Fixing PagedView resetting the currentPage, if scrollToPage was called before first layout
  This causes quickscrub to jump back to the current task if launcher activity was dead.
> Fixing missing callbacks in DeferredTouchConsumer causing missed quick scrub flings
> Sending the resents animation callbacks on the motion queue thread, to avoid synchronization
  issues with sysui callbacks.
> Waiting until the recents animation is received before starting the scale down animation
> Calculating the offset for quickscrub statically incase launcher activity was dead

Bug: 80214390
Change-Id: I1b7d00b7b266655a92fcd6239f25ba191655150f
2018-05-29 12:17:20 -07:00
Android Build Merger (Role) 13fbca937d [automerger] Fix clipping recents when scaling down am: 615ad40c38 am: 7f510c5886
Change-Id: Ief4341d4b37b59da54729c114fa066fc53484171
2018-05-29 19:15:32 +00:00
Android Build Merger (Role) 7f510c5886 [automerger] Fix clipping recents when scaling down am: 615ad40c38
Change-Id: I0e135e2fb4a867fae8f9c6cf20c24ebca58539e8
2018-05-29 19:15:30 +00:00
Tony 615ad40c38 Fix clipping recents when scaling down
- Parent shouldn't clip scaled down child
- Remove outline provider from scaled down child so it doesn't clip

Bug: 80267476
Change-Id: I9feb1ccf2069b8c88d8499e2813c818f9aea19af
2018-05-29 12:09:57 -07:00
Android Build Merger (Role) 3505c28af0 [automerger] Enable accessibility of Clear All button. am: a3e48d8035 am: 6ad288f99b
Change-Id: I7e62eb8e671f5be53611f94cf49eacb92978d4b3
2018-05-29 18:52:00 +00:00
Android Build Merger (Role) 6ad288f99b [automerger] Enable accessibility of Clear All button. am: a3e48d8035
Change-Id: I740bb25a5e942a9e15510b72f451ae13a79ae1ab
2018-05-29 18:51:59 +00:00
Vadim Tryshev a3e48d8035 Enable accessibility of Clear All button.
The button appears in the accessibility hierarchy
as a child of RecentsView.

This makes both Talkback and Switch access
to work with it normally.

Bug: 80156299
Test: Manual

Change-Id: Ife2044b2ef78fb27b32f2d33fb17744662a2b054
2018-05-29 18:51:57 +00:00
TreeHugger Robot a845e1500c Merge "Fix testWidgetsContainerFling" into ub-launcher3-edmonton 2018-05-29 18:09:52 +00:00
TreeHugger Robot 23c7ab0df5 Merge changes from topic "am-982993aa-a6c9-4319-b060-3e573baba696" into ub-launcher3-master
* changes:
  [automerger] Fix testWidgetsContainerFling am: 68ac46da0c am: 840bb420d1
  [automerger] Fix testWidgetsContainerFling am: 68ac46da0c
  Fix testWidgetsContainerFling
2018-05-29 18:09:52 +00:00
TreeHugger Robot 8ccf581dd5 Merge changes from topic "am-982993aa-a6c9-4319-b060-3e573baba696" into ub-launcher3-edmonton-polish
* changes:
  [automerger] Fix testWidgetsContainerFling am: 68ac46da0c
  Fix testWidgetsContainerFling
2018-05-29 18:09:52 +00:00
Jorim Jaggi 87356e7b48 Merge "Fix binder call for app opening" into ub-launcher3-edmonton 2018-05-29 17:40:56 +00:00
Jorim Jaggi 7f80f7ba03 Merge changes from topic "am-85c6df09-b17a-490c-b342-44016a3b1282" into ub-launcher3-master
* changes:
  [automerger] Fix binder call for app opening am: 1d1a3d7242 am: 518a353826
  [automerger] Fix binder call for app opening am: 1d1a3d7242
  Fix binder call for app opening
2018-05-29 17:40:56 +00:00
Jorim Jaggi 33ff0d17af Merge changes from topic "am-85c6df09-b17a-490c-b342-44016a3b1282" into ub-launcher3-edmonton-polish
* changes:
  [automerger] Fix binder call for app opening am: 1d1a3d7242
  Fix binder call for app opening
2018-05-29 17:40:56 +00:00
TreeHugger Robot 03aaced252 Merge "Fix clipping of adaptive icons Bug:62372639" into ub-launcher3-edmonton 2018-05-29 17:38:28 +00:00
Android Build Merger (Role) 6876902357 [automerger] Report when a notification is shown in the popup am: c97d846372
Change-Id: Iff0559113aea636559400a5772b0749d4855b225
2018-05-29 17:05:08 +00:00
Tony c97d846372 Report when a notification is shown in the popup
Change-Id: I5c06b18f731e2dc8e47bacba59746fc4cc02c42c
2018-05-29 17:05:02 +00:00
Erik Kline bb198b763c [automerger skipped] Merge "Default to AAPT2 = false in AOSP only" am: 6146e28628 am: 5eca469669 -s ours
am: 66cac57064  -s ours

Change-Id: I224ae1137ac2c9cafe0301ca3648cab7a6dd3347
2018-05-29 09:16:13 -07:00
Erik Kline 66cac57064 [automerger skipped] Merge "Default to AAPT2 = false in AOSP only" am: 6146e28628
am: 5eca469669  -s ours

Change-Id: I328a1f5f457b55b77e941536daaaef77e40ef6ff
2018-05-29 09:10:39 -07:00