Xin Li
e2d8c0c312
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: aa168f204e -s ours
...
am skip reason: Merged-In I7f5bca7edd18631b36f2b9213e17554cf769cbc6 with SHA-1 861ce33a59 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2863559
Change-Id: Ifecff25b799b50b69594c664bfa4351b2251166e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 21:19:18 +00:00
Xin Li
3cbfd5623b
[automerger skipped] Merge Android 14 QPR1 am: 65e37d77fe -s ours
...
am skip reason: Merged-In I7f5bca7edd18631b36f2b9213e17554cf769cbc6 with SHA-1 861ce33a59 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2863559
Change-Id: Ie15a9e1fdafe177270dc6c5102ed1c2f86ab30e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 21:16:25 +00:00
Xin Li
aa168f204e
Merge "Merge Android 14 QPR1" into main
2023-12-09 00:12:03 +00:00
Xin Li
65e37d77fe
Merge Android 14 QPR1
...
Merged-In: I7f5bca7edd18631b36f2b9213e17554cf769cbc6
Bug: 315507370
Change-Id: I53db199aae0b6104272ad9cdcf86fa878758124b
2023-12-08 13:14:20 -08:00
Xin Li
861ce33a59
Merge UQ1A.231205.015
...
Bug: 308969284
Merged-In: I91dd8b4088f02af9dc5e603853d8e26606acc38f
Change-Id: I7f5bca7edd18631b36f2b9213e17554cf769cbc6
2023-12-07 15:48:03 -08:00
Winson Chung
f3eb5388d1
Merge "Don't open PiP when freeform is opened from recent" into main am: 0c531d5dbb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2743811
Change-Id: I41d412ee0c6d5c6dacd875c549b724b439e1d542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 23:24:23 +00:00
Winson Chung
0c531d5dbb
Merge "Don't open PiP when freeform is opened from recent" into main
2023-11-16 22:53:56 +00:00
Robin Vinterbladh
018edc452d
Don't open PiP when freeform is opened from recent
...
When opening freeform window from recents menu PiP should not
be started at the same time since the PiP transition can cause
freeform to not work as intended.
Bug: 299505542
Change-Id: I6392089b3ac9ce914fb37cc84780f28aa3fc75f8
2023-11-15 09:41:10 +01:00
Android Build Coastguard Worker
307d65beee
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25086887'] into udc-qpr1-release.
...
Change-Id: I8b641f9a2592b2e3eeee9c4a500c518fb7069984
2023-10-18 01:56:48 +00:00
Alex Chau
fb2f4b1a6f
Avoid drawing live tile behind recents when launching on grid overview
...
Fix: 304911154
Flag: none
Test: Swipe up in tablet, scroll to side, launch focused task
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1f5de2483bc9eb36128a7f700ca4539591afd186 )
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c44b3cdda9b8d51ec2142e65674617d34d9a5c9d )
Merged-In: I91dd8b4088f02af9dc5e603853d8e26606acc38f
Change-Id: I91dd8b4088f02af9dc5e603853d8e26606acc38f
2023-10-18 01:55:44 +00:00
Xin Li
6212824683
Merge 10952656
...
Merged-In: I027ebf7933332b48434144f9776fb8a29c783fb6
Change-Id: I27447ca2f3cae8482ab7f43506cea5cfa163346e
2023-10-17 10:08:47 -07:00
Android Build Coastguard Worker
6b83334e4d
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25058707'] into udc-qpr1-release.
...
Change-Id: Iaeeb3a4bb9b1148fc54bbe41ed79f4b304ccb57a
2023-10-17 02:45:56 +00:00
Pat Manning
0cf05c92e3
Set FastBitmapDrawable's badge alpha when updating drawable alpha.
...
Test: FastBitmapDrawableTest
Fix: 304559962
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:08f89425bbd652f9f6e0ad0d31f2e9aba8556705 )
Merged-In: Ie545cc5da506c77af18f99b5d045cafc37110a5a
Change-Id: Ie545cc5da506c77af18f99b5d045cafc37110a5a
2023-10-17 02:43:07 +00:00
Android Build Coastguard Worker
cb82bf2095
Snap for 10949315 from 5838767cc2 to udc-qpr1-release
...
Change-Id: I65a2d2100f3b40b4bd353bce578156e41cac67ac
2023-10-14 01:24:20 +00:00
Jon @
9f3945cfff
Merge "Fix bug where All Apps button loads in late in taskbar." into udc-qpr-dev am: 5838767cc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/25021492
Change-Id: I027ebf7933332b48434144f9776fb8a29c783fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-13 18:58:06 +00:00
Jon @
5838767cc2
Merge "Fix bug where All Apps button loads in late in taskbar." into udc-qpr-dev
2023-10-13 18:37:04 +00:00
fbaron
eb8d8e8066
Add NullPointerException to try/catch since it's possible to have such an error am: 9ffd90a85b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/25031355
Change-Id: I935bb241e0b08ddb806f32d233ee359355d95df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 21:23:31 +00:00
fbaron
9ffd90a85b
Add NullPointerException to try/catch since it's possible to have such an error
...
getShortcutIconDrawable could return null "Method invocation 'getShortcutIconDrawable' may produce 'NullPointerException'" and it leads to the code crashing. Adding NullPointerException as one of the exceptions in the try/catch would resolve this issue
Fix: 299525046
Test: verify after merging that the null pointer exception stops occurring
Flag: no flag
Change-Id: I52cfba9c7b08ea4e1b0f4506c461e79c3e91dc6c
(cherry picked from commit 7e6107caaf )
2023-10-12 17:02:28 +00:00
Jon Miranda
1e931890d1
Fix bug where All Apps button loads in late in taskbar.
...
We need to re-create the icon alignment controller if the
stash status changes, otherwise it will use an old value.
Bug: 296414290
Test: home to app then quickly unstash
Change-Id: I35f23842f289fce95d102a9a93dc94cd033fa8cc
2023-10-11 13:28:08 -07:00
Android Build Coastguard Worker
3ab5d0697b
Snap for 10928679 from a2a4b84db1 to udc-qpr1-release
...
Change-Id: I42d51b3e663c6f962023a0d195cb497bf5528be2
2023-10-10 23:20:18 +00:00
Krzysztof Kosiński
b085f9e819
Merge "Clean up obsolete aliases for Truth." into main am: a4bc505d01 am: 6247399c9b am: f56d690e22 am: 42c39649a7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2778094
Change-Id: Idc45788d21959e1569e0fd33686536a9675442ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 21:50:07 +00:00
Krzysztof Kosiński
42c39649a7
Merge "Clean up obsolete aliases for Truth." into main am: a4bc505d01 am: 6247399c9b am: f56d690e22
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2778094
Change-Id: Ief1a7711ee66ce89708ed9bb0daed55471383329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 21:17:18 +00:00
Krzysztof Kosiński
f56d690e22
Merge "Clean up obsolete aliases for Truth." into main am: a4bc505d01 am: 6247399c9b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2778094
Change-Id: I60a48030963d6f2e9ddd090e0438bd3b0ba714ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 20:10:09 +00:00
Krzysztof Kosiński
6247399c9b
Merge "Clean up obsolete aliases for Truth." into main am: a4bc505d01
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2778094
Change-Id: Ic9eed67c9957d2702a0b01319dc63688189f3963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 19:36:40 +00:00
Krzysztof Kosiński
a4bc505d01
Merge "Clean up obsolete aliases for Truth." into main
2023-10-10 18:28:25 +00:00
Krzysztof Kosiński
6e3b7a6943
Clean up obsolete aliases for Truth.
...
Bug: 255714762
Test: presubmit
Change-Id: Idd56488c129096c520e4e69f175778f10156a569
2023-10-10 06:50:28 +00:00
Automerger Merge Worker
281ad63c31
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: 2e3aea5133 -s ours am: 2d42f8724e -s ours" into udc-qpr-dev-plus-aosp
2023-10-10 01:38:52 +00:00
Automerger Merge Worker
644a5bd5b4
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: f145e084cc -s ours am: a2a4b84db1 -s ours" into udc-qpr-dev-plus-aosp
2023-10-10 01:37:16 +00:00
Bill Yi
5adb4d0f59
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: 2e3aea5133 -s ours am: 2d42f8724e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24975341
Change-Id: I6ce7a8c9c4405f30cb130a850d3ec05aaca6bf14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:36:28 +00:00
Bill Yi
9909efb8d5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: f145e084cc -s ours am: a2a4b84db1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24975341
Change-Id: I451c39ac87ddf83e51e1b7404b9092f84abd8844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:32:31 +00:00
Bill Yi
f0f05a30dc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: f145e084cc -s ours am: 4113114d9c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24975341
Change-Id: Id47b68afbe921c3515c1d1cdd60b479734f9e6ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:31:40 +00:00
Automerger Merge Worker
1ba2273553
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b26a6ef18 -s ours am: dae4fd731e -s ours" into udc-qpr-dev-plus-aosp
2023-10-10 01:30:34 +00:00
Bill Yi
b621499fde
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b26a6ef18 -s ours am: 4c74dcb8f2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24975342
Change-Id: I2567885934c625e60d0d82eae245dde6498b6183
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:26:17 +00:00
Bill Yi
e96a39e257
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b26a6ef18 -s ours am: dae4fd731e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24975342
Change-Id: I5625a841e2d2c9843c230f9d6f7d3265916a2a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:25:31 +00:00
Bill Yi
2d42f8724e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: 2e3aea5133 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24975341
Change-Id: I77dae3d8d96b693382fb7612234bf938d30eb01c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:25:08 +00:00
Bill Yi
a2a4b84db1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: f145e084cc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24975341
Change-Id: Ie6e5ba75ff8a5e7cda38ab8f749dca85461bf66e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:15:35 +00:00
Bill Yi
dae4fd731e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b26a6ef18 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24975342
Change-Id: I83e05d16a6b305810020a039d18dc9f1a1a41422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:11:29 +00:00
Bill Yi
4113114d9c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours am: f145e084cc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24975341
Change-Id: If655986413295adc22b003b068801aa2270b47a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:09:24 +00:00
Bill Yi
4c74dcb8f2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b26a6ef18 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24975342
Change-Id: I163009954fd36895e4015e5b782e37169486fd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:03:14 +00:00
Bill Yi
f145e084cc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24975341
Change-Id: I984f6bf4764b7e00843d0df001e51d2728de9c46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:01:25 +00:00
Bill Yi
2e3aea5133
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53bc743c58 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24975341
Change-Id: I0fb40c56224a8bebdd37daefa47977fa7026f99b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:01:00 +00:00
Android Build Coastguard Worker
aa217bec1d
Snap for 10922969 from 928e0521b2 to udc-qpr1-release
...
Change-Id: If866bc4fea7d8377ef44c62799c2e7a5c0a2069e
2023-10-09 23:53:36 +00:00
Andreas Agvard
d25afb7eab
DO NOT MERGE Temporary fix for race condition. am: 928e0521b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24955345
Change-Id: Iae4f125b437f3fc4528851d48432757b1121f353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-09 18:21:59 +00:00
Andreas Agvard
928e0521b2
DO NOT MERGE Temporary fix for race condition.
...
Bug: 303078360
Test: Manual
Change-Id: I7355e3b64424492b6fab4f416014d2a9a797973d
2023-10-07 22:55:17 +00:00
Bill Yi
3b26a6ef18
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I377cbd4c47099777bb6a8dde57582f0687ac0b1d
2023-10-06 19:03:42 -07:00
Bill Yi
53bc743c58
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6f3aec8a927fbd499f6693596d7233d7f3f8a988
2023-10-06 19:03:18 -07:00
Xin Li
4794801b4b
[automerger skipped] Merge "Merge Android 14" into main am: 691104e82e -s ours am: b80f0cf7a4 -s ours am: 5974c63c48 -s ours am: bf38b4f81d -s ours
...
am skip reason: Merged-In If4c6783472d7fa05a1162e2f176a613d28f7bec3 with SHA-1 20d7edb05f is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2776973
Change-Id: Id3019f036205ae016f1c05bb1ab3b090b1a5d0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 11:04:50 +00:00
Xin Li
3ef97638da
[automerger skipped] Merge Android 14 am: f3d805e7f2 -s ours am: 51c4ef1a3f -s ours am: 9cb6abcd09 -s ours am: 267ff14379 -s ours
...
am skip reason: Merged-In If4c6783472d7fa05a1162e2f176a613d28f7bec3 with SHA-1 20d7edb05f is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2776973
Change-Id: I143a1d62f0615dadbc4d7d6bdb3a4b867a486b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 11:00:08 +00:00
Xin Li
bf38b4f81d
[automerger skipped] Merge "Merge Android 14" into main am: 691104e82e -s ours am: b80f0cf7a4 -s ours am: 5974c63c48 -s ours
...
am skip reason: Merged-In If4c6783472d7fa05a1162e2f176a613d28f7bec3 with SHA-1 20d7edb05f is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2776973
Change-Id: I5ead25f75b7bde52041674ea8038af400005f12f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 09:54:58 +00:00
Xin Li
267ff14379
[automerger skipped] Merge Android 14 am: f3d805e7f2 -s ours am: 51c4ef1a3f -s ours am: 9cb6abcd09 -s ours
...
am skip reason: Merged-In If4c6783472d7fa05a1162e2f176a613d28f7bec3 with SHA-1 20d7edb05f is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2776973
Change-Id: I55f5a7fb113fc4e66ec19ce6c87f151dd64dab6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 09:50:16 +00:00