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
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
Xin Li
5974c63c48
[automerger skipped] Merge "Merge Android 14" into main am: 691104e82e -s ours am: b80f0cf7a4 -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: I21f6ec292c3cf5bed714fb32beaf0a8dc5ed9085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 09:03:04 +00:00
Xin Li
9cb6abcd09
[automerger skipped] Merge Android 14 am: f3d805e7f2 -s ours am: 51c4ef1a3f -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: I92a8bf4e00370ef504bb5ef94e337ddffa995b44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 08:58:35 +00:00
Xin Li
b80f0cf7a4
[automerger skipped] Merge "Merge Android 14" into main am: 691104e82e -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: I7f42cff8cb3128405ec0e4796d7c6d2ec52572f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 07:56:17 +00:00
Xin Li
51c4ef1a3f
[automerger skipped] Merge Android 14 am: f3d805e7f2 -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: I7d5f683282814ee7027086aee356e9bf0bca3380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 07:51:36 +00:00
Xin Li
691104e82e
Merge "Merge Android 14" into main
2023-10-06 05:34:30 +00:00
Xin Li
f3d805e7f2
Merge Android 14
...
Bug: 298295554
Merged-In: If4c6783472d7fa05a1162e2f176a613d28f7bec3
Change-Id: I63fb79ae0ea2c39d65ca17fcaa34a8e3b993619f
2023-10-05 15:41:41 -07:00
Andy Wickham
3f42cf5fea
Merge "Add awickham to OWNERS file" into udc-qpr-dev am: bf4a08acef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24955693
Change-Id: I97341587170042a3731440fb3917884bac517514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 20:42:22 +00:00
Andy Wickham
bf4a08acef
Merge "Add awickham to OWNERS file" into udc-qpr-dev
2023-10-05 20:07:25 +00:00
Tony Wickham
3809c0a278
Merge "Fix gestures for exclude-from-recents + translucent tasks" into udc-qpr-dev am: cf596d4178
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24840504
Change-Id: I4a2cc03328d09757ff1a5454138b61794a5cadee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 19:05:04 +00:00
Tony Wickham
cf596d4178
Merge "Fix gestures for exclude-from-recents + translucent tasks" into udc-qpr-dev
2023-10-05 18:16:40 +00:00
hyunyoungs
0bac78be6e
Add awickham to OWNERS file
...
Change-Id: Ib7cec7caf615ed8974f09df4eb9d93ea117e756b
2023-10-05 09:18:19 -07:00
Anushree Ganjam
2fbb34fc7b
Developer options should reflect the correct DeviceConfig value for ReleaseFlag. am: 13517070d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24945015
Change-Id: Ic0b22dd740409cafc3a4224e3dba3ed7ac60516f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 16:09:05 +00:00
Anushree Ganjam
13517070d8
Developer options should reflect the correct DeviceConfig value for ReleaseFlag.
...
Before this change : When a ReleaseFlag is turned on from server side or
set in DeviceConfig, developer options shows the flag is off.
After this change : When a ReleaseFlag is turned on from server side or
set in DeviceConfig, developer options shows the flag is on.
This change doesn't reflect the DeviceConfig value changes done using
`adb shell device_config put` unless launcher is restarted.
Bug: 297202824
Test: Manual
Flag: NA
Change-Id: I5d83207cf454c60278fd02e59199207e855d51a8
Merged-In: I5d83207cf454c60278fd02e59199207e855d51a8
(cherry picked from commit 9eb68bb7cf )
2023-10-05 01:45:32 +00:00
Tony Wickham
94a0a58b37
Fix gestures for exclude-from-recents + translucent tasks
...
- If task is translucent and excluded, fade out as swipe up
- Fade back in when re-launching live tile
- Ignore excluded tasks if there is another visible task,
and use that underlying task during gesture instead.
Fixes: 299351175
Fixes: 300297333
Fixes: 302672319
Test: Invoke translucent + excluded app (e.g. expanded Volume
dialog) over another app, swipe to overview, quick switch, home
Change-Id: I5740afc4bf561d1a264bd132863ffc15f27d2b20
2023-10-04 20:23:07 +00:00
Bill Yi
33ed0d9421
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6105891d36 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24934922
Change-Id: I97348c628a64dca66df635d453d77d6f425fb9c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 19:09:22 +00:00
Bill Yi
6105891d36
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If4ad039f050e4561270ff10218401060c3f94362
2023-10-03 22:14:28 -07:00
Automerger Merge Worker
fc164abbbd
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae62fdcad1 -s ours am: db1564dc30 -s ours am: bcac59d6ea -s ours" into udc-qpr-dev-plus-aosp
2023-10-03 05:14:13 +00:00
Automerger Merge Worker
4a7f1cdd3d
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae62fdcad1 -s ours am: db1564dc30 -s ours" into udc-d1-dev-plus-aosp am: e14815cc7f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24916778
Change-Id: Iac0ef0b5030c87bbada80154727f2f35574524ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 05:12:34 +00:00
Bill Yi
5148433509
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae62fdcad1 -s ours am: db1564dc30 -s ours am: a380b3df30 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24916778
Change-Id: Iec557f0e4ac85982442b6885da408e1c160220a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 05:12:19 +00:00
Bill Yi
6e2dc49c25
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae62fdcad1 -s ours am: db1564dc30 -s ours am: bcac59d6ea -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24916778
Change-Id: Ib2ea54a8bdb06cc238a7e63fe5646ed9b92a215b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 05:09:13 +00:00
Bill Yi
1c31edfc91
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae62fdcad1 -s ours am: dd2a64afa2 -s ours am: 361bfff1bc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24916778
Change-Id: Id2e890b8ba443ea4a19685b6e7ca094095861bc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 05:08:36 +00:00
Automerger Merge Worker
e14815cc7f
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae62fdcad1 -s ours am: db1564dc30 -s ours" into udc-d1-dev-plus-aosp
2023-10-03 04:39:58 +00:00
Bill Yi
bcac59d6ea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae62fdcad1 -s ours am: db1564dc30 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24916778
Change-Id: If1984c83b5d81c5530fe8e845b820808b1e9b5ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 04:36:24 +00:00
Bill Yi
361bfff1bc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae62fdcad1 -s ours am: dd2a64afa2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24916778
Change-Id: Ic3061566d2744ae07fef5e44570d5432d8687df3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 04:35:39 +00:00
Bill Yi
a380b3df30
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae62fdcad1 -s ours am: db1564dc30 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24916778
Change-Id: Ib652b74bced5fbefeefe190f0da2667c487d1416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 04:34:45 +00:00
Bill Yi
db1564dc30
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae62fdcad1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24916778
Change-Id: I64457a597525e4199671585b4f082a02de6105c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 03:50:33 +00:00
Bill Yi
dd2a64afa2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae62fdcad1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24916778
Change-Id: I1a7a052ce39eada3ca3b47851627e8d80b15632a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 03:48:42 +00:00