Commit Graph
49925 Commits
Author SHA1 Message Date
Tony 2f347149af Shift recents up slightly in quick scrub
Bug: 79883290
Change-Id: If57fd52505d7f965ea8a28e90e715c5723915e57
2018-05-30 14:28:20 -07:00
Tony Wickham 3635123e45 Merge "Fix animation not playing when going home while another animation is playing" into ub-launcher3-edmonton 2018-05-30 19:31:06 +00:00
Tony Wickham 813ab5c83e Merge changes from topic "am-3ad0ccd0-ca7c-4572-b131-aa4fe70fe454" into ub-launcher3-edmonton-polish
* changes:
  [automerger] Fix animation not playing when going home while another animation is playing am: 67f9cad75a
  Fix animation not playing when going home while another animation is playing
2018-05-30 19:31:06 +00:00
Tony Wickham 2e38575532 Merge changes from topic "am-3ad0ccd0-ca7c-4572-b131-aa4fe70fe454" into ub-launcher3-master
* changes:
  [automerger] Fix animation not playing when going home while another animation is playing am: 67f9cad75a am: 7b77403629
  [automerger] Fix animation not playing when going home while another animation is playing am: 67f9cad75a
  Fix animation not playing when going home while another animation is playing
2018-05-30 19:31:06 +00:00
Colin Cross aa0e8dc649 [automerger skipped] Merge "Revert "Default to AAPT2 = false in AOSP only"" am: 035c5a35a6 am: 09db0149a0 -s ours
am: 7dfc10392e  -s ours

Change-Id: I951d53053e14c8ab2ea8c47a93a0f706096631f8
2018-05-29 18:17:18 -07:00
Colin Cross 7dfc10392e [automerger skipped] Merge "Revert "Default to AAPT2 = false in AOSP only"" am: 035c5a35a6
am: 09db0149a0  -s ours

Change-Id: I66209abfe3fa4984473c5f09a52e472f6fe47978
2018-05-29 18:14:42 -07:00
Sunny Goyal 26c5246d34 [automerger skipped] Merge "Fixing wrong xml refenrece when the packageName is changed" am: 1179b71480 am: a58015e7e5 -s ours
am: 74be875eb4  -s ours

Change-Id: I5acfac8497372d0e42e9efaf6575d748de7480ec
2018-05-29 17:56:56 -07:00
Colin Cross 09db0149a0 Merge "Revert "Default to AAPT2 = false in AOSP only""
am: 035c5a35a6

Change-Id: Ie75f91869a8251fa3920094fd6389d88d97e96df
2018-05-29 17:45:38 -07:00
Android Build Merger (Role) c7c050497c [automerger] Fix animation not playing when going home while another animation is playing am: 67f9cad75a am: 7b77403629
Change-Id: I06b6f28a514852c7f11698f5b54c4a26f3244631
2018-05-30 00:39:06 +00:00
Android Build Merger (Role) 7b77403629 [automerger] Fix animation not playing when going home while another animation is playing am: 67f9cad75a
Change-Id: Ifabc0562f8dbe0e3c8f7a3e706e56c529dfdc4cb
2018-05-30 00:39:04 +00:00
Android Build Merger (Role) befcbd176e [automerger] Removing accessibility action for Clear-all am: 442fc108c3 am: a3e47fe80c
Change-Id: I470061377e6fb1dce4f17425e0d6b780b805bd85
2018-05-30 00:36:26 +00:00
Android Build Merger (Role) a3e47fe80c [automerger] Removing accessibility action for Clear-all am: 442fc108c3
Change-Id: I994543bd712963b26ab2b29e279a1758f4468520
2018-05-30 00:36:24 +00:00
Vadim Tryshev 442fc108c3 Removing accessibility action for Clear-all
Now that Clear-all button is visible for accessibility, there is no need
in it.

Bug: 80156299
Test: Manual
Change-Id: I5997692be015947692a8bb720a449d1d36302526
2018-05-29 17:34:19 -07:00
Tony 67f9cad75a Fix animation not playing when going home while another animation is playing
When going to a new state, we cancel any currently playing animation. When
canceling the animation, we reset mState = mCurrentStableState. Thus, when
determining the duration of the new animation, we have both state == NORMAL
and mState == NORMAL, leading to a duration of 0 and therefore no animation.
Storing the fromState before canceling/resetting fixes the issue.

Change-Id: I92332deae8058c4dd41212fe7f749955ede28b1c
2018-05-29 17:33:16 -07:00
Colin Cross 035c5a35a6 Merge "Revert "Default to AAPT2 = false in AOSP only"" 2018-05-29 23:41:34 +00:00
Sunny Goyal 74be875eb4 [automerger skipped] Merge "Fixing wrong xml refenrece when the packageName is changed" am: 1179b71480
am: a58015e7e5  -s ours

Change-Id: I0f8f7e8366f367247506f16fb39be874a9496f2a
2018-05-29 16:39:39 -07:00
Sunny Goyal a58015e7e5 Merge "Fixing wrong xml refenrece when the packageName is changed"
am: 1179b71480

Change-Id: Ifb7eefd4bcccfcc3450e385cee1f777cd44589a6
2018-05-29 16:01:02 -07:00
Android Build Merger (Role) a805c19e6c [automerger] Update displacement on ACTION_UP as well, in case ACTION_UP and came in a different frame than last ACTION_MOVE am: ab66067def am: 6d75448fdb
Change-Id: I2d394c09dbe4c1e1a1d782278f8ab776f101eb36
2018-05-29 22:55:08 +00:00
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