Android Build Merger (Role)
5ed9be7e18
[automerger] Skip logging if device profile is not initialized am: 87168ca1f7 am: 4534bd9423
...
Change-Id: Ic31dfb4f6b0f427a6999128cbd777479fc40a69c
2018-06-01 19:54:49 +00:00
Android Build Merger (Role)
4534bd9423
[automerger] Skip logging if device profile is not initialized am: 87168ca1f7
...
Change-Id: I2729ac8d3ac15ac7dd92aba2927c6cbb8dd7b3de
2018-06-01 19:54:47 +00:00
Sunny Goyal
87168ca1f7
Skip logging if device profile is not initialized
...
Since recentsAnimation and animationCancel come on the event queue, we may skip
recentsAnimation and only process animationCancel if they happen too close to
each other, before the first event is scheduled on eventQueue.
As a result deviceProfile is never initialized.
Prevent crash by skipping logging in this case, we shouldn't be logging it anyway
Bug: 80515833
Change-Id: Ife1d6009bcdc34af6c281d848665145cd235fa40
2018-06-01 12:54:10 -07:00
Android Build Merger (Role)
672ed10a11
[automerger] Skip shelf adjustment for PIP when quickscrubbing am: edd4f89f4d
...
Change-Id: I3ae41c47d1472dc9e3c63814223a186e06313ec7
2018-06-01 18:24:54 +00:00
Tracy Zhou
edd4f89f4d
Skip shelf adjustment for PIP when quickscrubbing
...
Change-Id: I6dbf63dfda608601baa257125db5ec69af9f30ee
Fixes: 80316126
Test: Manual test
2018-06-01 11:24:42 -07:00
Jorim Jaggi
c1ee70bf3d
Merge changes from topics "am-d455296f-ca9f-4a88-999f-65e8ba3f6b8a", "am-6ed11203-0b52-4aea-b304-3f471c0aa3bf" into ub-launcher3-edmonton
...
* changes:
Use SyncRtSurfaceTransactionApplier for recents enter/exit
Use SyncRtSurfaceTransactionApplier for app opening
2018-06-01 12:27:04 +00:00
Jorim Jaggi
6b42b27619
Merge changes from topics "am-d455296f-ca9f-4a88-999f-65e8ba3f6b8a", "am-6ed11203-0b52-4aea-b304-3f471c0aa3bf" into ub-launcher3-master
...
* changes:
[automerger] Use SyncRtSurfaceTransactionApplier for recents enter/exit am: 80b9314781 am: a7fdc39755
[automerger] Use SyncRtSurfaceTransactionApplier for recents enter/exit am: 80b9314781
Use SyncRtSurfaceTransactionApplier for recents enter/exit
[automerger] Use SyncRtSurfaceTransactionApplier for app opening am: 1008f6d72e am: 65456764cb
[automerger] Use SyncRtSurfaceTransactionApplier for app opening am: 1008f6d72e
Use SyncRtSurfaceTransactionApplier for app opening
2018-06-01 12:27:04 +00:00
Jorim Jaggi
02e2865ab9
Merge changes from topics "am-d455296f-ca9f-4a88-999f-65e8ba3f6b8a", "am-6ed11203-0b52-4aea-b304-3f471c0aa3bf" into ub-launcher3-edmonton-polish
...
* changes:
[automerger] Use SyncRtSurfaceTransactionApplier for recents enter/exit am: 80b9314781
Use SyncRtSurfaceTransactionApplier for recents enter/exit
[automerger] Use SyncRtSurfaceTransactionApplier for app opening am: 1008f6d72e
Use SyncRtSurfaceTransactionApplier for app opening
2018-06-01 12:27:04 +00:00
android-build-team Robot
0257b59091
Snap for 4816034 from b6a21c423f to qt-release
...
Change-Id: I55717cf04abde7800c851a1d784bcc83152cf63b
2018-06-01 09:31:28 +00:00
TreeHugger Robot
73fa670a55
Merge changes from topic "am-1bd70ed4-061f-4a07-a290-3195cb409e98" into ub-launcher3-master
...
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: d943aacbfe skipped: e185ee54d4
[automerger skipped] Import translations. DO NOT MERGE skipped: d943aacbfe
Import translations. DO NOT MERGE
2018-06-01 02:22:20 +00:00
Jon
b6a21c423f
Merge branch 'ub-launcher3-edmonton' into pi-dev am: bf29023212
...
am: 27cd4e6d34
Change-Id: Idff79a165f2f6237b42748370c9b988980813d0e
2018-05-31 17:39:11 -07:00
Bill Yi
3f90a2dcf6
Import translations. DO NOT MERGE
...
Change-Id: I2078cff13794d2802f91dbce3ac92994af8fcfa1
Auto-generated-cl: translation import
2018-05-31 17:30:53 -07:00
Android Build Merger (Role)
1aeb7c3075
[automerger skipped] Import translations. DO NOT MERGE skipped: d943aacbfe skipped: e185ee54d4
...
Change-Id: I127bc3a9cd9f7d9ad877c058214027a84859f976
2018-06-01 00:28:34 +00:00
Android Build Merger (Role)
e185ee54d4
[automerger skipped] Import translations. DO NOT MERGE skipped: d943aacbfe
...
Change-Id: I86a918f0492a47596257f3391de5fa072137f087
2018-06-01 00:28:30 +00:00
Bill Yi
d943aacbfe
Import translations. DO NOT MERGE
...
Change-Id: Idf5bc036acf70e711dcd166787ceb6c494027ea4
Auto-generated-cl: translation import
2018-05-31 17:25:09 -07:00
Jon
27cd4e6d34
Merge branch 'ub-launcher3-edmonton' into pi-dev
...
am: bf29023212
Change-Id: I6ef016a92f772bf74b85c7eec84110269adf83ea
2018-05-31 15:22:09 -07:00
Android Build Merger (Role)
1e636dfa08
[automerger] Do not run StateHandler code while holding the lock am: f46779fe01 am: bda981419c
...
Change-Id: I90c280ebe5868ffc92618134802c95f7acc2b4c3
2018-05-31 21:13:05 +00:00
Android Build Merger (Role)
bda981419c
[automerger] Do not run StateHandler code while holding the lock am: f46779fe01
...
Change-Id: I2281b44fd9cc4156a759cb3828b2829d324439cd
2018-05-31 21:13:03 +00:00
Sunny Goyal
f46779fe01
Do not run StateHandler code while holding the lock
...
Deadlock:
Main thread:
InternalStateHandler.run() =>
LauncherFrameDrawn =>
Switch MotionEventQueue to Main thread =>
Try to acquire MotionEventQueue lock while holding InternalStateHandler lock
Remote UI thread
Recents Animation cancel on MotionEventQueue =>
Cancel SwipeHandler =>
Clear previously registered InternalStateHandler =>
Try to acquire InternalStateHandler lock while holding MotionEventQueue lock
Bug: 80536505
Change-Id: I75e522edea2a76f8bc90e8abc2a174583cc709c4
2018-05-31 14:12:52 -07:00
Jon
bf29023212
Merge branch 'ub-launcher3-edmonton' into pi-dev
...
Bug: 80134723
Test: manual
Change-Id: If8e9c1b1aacf547ab7a1edaccaa9fed5e976a980
2018-05-31 13:15:57 -04:00
TreeHugger Robot
f4392dbf5a
Merge "Some launcher3 fixes so that it compiles with different configurations" into ub-launcher3-edmonton
2018-05-31 16:42:56 +00:00
Android Build Merger (Role)
a7d219f798
[automerger] Some launcher3 fixes so that it compiles with different configurations am: d0f43ceba7 am: 9e40ef9894
...
Change-Id: Ie3eed75fab341dfe274a566c71d6b6fdbab70854
2018-05-31 01:15:28 +00:00
Android Build Merger (Role)
9e40ef9894
[automerger] Some launcher3 fixes so that it compiles with different configurations am: d0f43ceba7
...
Change-Id: I4886d9a1880c35ebb36ccda20401e6c7e394dad9
2018-05-31 01:15:27 +00:00
Sunny Goyal
d0f43ceba7
Some launcher3 fixes so that it compiles with different configurations
...
Bug: 79996542
Change-Id: I4267aeb8f5b0714415970c63453049ff41466644
2018-05-30 18:15:21 -07:00
TreeHugger Robot
c86805f433
Merge "Theme updates for dark text:" into ub-launcher3-edmonton
2018-05-30 23:06:26 +00:00
Android Build Merger (Role)
a648206cd5
[automerger] Theme updates for dark text: am: 337fcb7983 am: a4feb0c385
...
Change-Id: Id1edd1dfac985be021f84e92c9014bcbf61608bb
2018-05-30 22:53:18 +00:00
Android Build Merger (Role)
a4feb0c385
[automerger] Theme updates for dark text: am: 337fcb7983
...
Change-Id: Ib43cca83d5cc0e02a6f5cab4b20ecf325361b08b
2018-05-30 22:53:16 +00:00
Sunny Goyal
337fcb7983
Theme updates for dark text:
...
> Using white scrim on adjescent tiles in overview
> Using a ligher scrim in dark-theme+dark-text
Bug: 80253867
Change-Id: I3f257d3addaca8bc5970a61722f5ae0e7af89382
2018-05-30 15:53:10 -07:00
Android Build Merger (Role)
f9f6e18eb7
[automerger] Deleting invalid icons when an app is restored am: e48fe1095d
...
Change-Id: Ia1f31b6c9c7cad813797357be1a3932aeae911ea
2018-05-30 22:23:21 +00:00
Sunny Goyal
e48fe1095d
Deleting invalid icons when an app is restored
...
When a app is restored, it may not be in exactly the same state as it was when backed up.
Some components might be missing, and some shortcuts may be disabled or unavailable
Bug: 63525806
Change-Id: I09e6c0e9a9d2c1e8ccd73430f94bd065bdf2718e
2018-05-30 15:23:09 -07:00
Android Build Merger (Role)
477c353e77
[automerger] Shift recents up slightly in quick scrub am: 2f347149af am: c000c34add
...
Change-Id: Ic0d0afea6bb69f13f35b95fee453311b059229eb
2018-05-30 21:28:40 +00:00
Android Build Merger (Role)
c000c34add
[automerger] Shift recents up slightly in quick scrub am: 2f347149af
...
Change-Id: I419c960ecd3c5cff44a58f8d94c230f61f85236c
2018-05-30 21:28:38 +00:00
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