c266b8965a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a39289296 -s ours am: 59b68fedf8 -s ours am: 586137531f -s ours am: a1ac050335 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2045753
Change-Id: I693754c1d3f6efb089b68a61287cb31ba3f20f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:41:06 +00:00
0933759f66
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e199dfaf47 -s ours am: 86627586b2 -s ours am: 13a2fe7b98 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17422265
Change-Id: Id26b4a9493ff3fb9aea7f01a83e02e6f4759c802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:40:38 +00:00
2787f4ccfb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fba444664 -s ours am: 609b9fed35 -s ours am: 3e427bcd46 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17422265
Change-Id: I72120516d5434e11c255960ba56403e164ae4b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:40:37 +00:00
dcfb7ad209
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c53b90fcf9 -s ours am: d5b5be48cc -s ours am: 95a9e02f3e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17422119
Change-Id: I3fbd12a9c02fc35ded22f965e25ce21819d27c51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:39:00 +00:00
4d09723f68
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3c6ff41f9 -s ours am: a27a229049 -s ours am: d7483e2691 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17422119
Change-Id: I95c43b91ae9e3d3c98f5a47522ee054c507cb96f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:38:58 +00:00
86335da4f1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4383a121dd -s ours am: 089bd81a7c -s ours am: 4793962dbe -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17422264
Change-Id: I9dd94ddd0187f35213ece0cd75e6e59ac8462776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:35:23 +00:00
a1ac050335
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a39289296 -s ours am: 59b68fedf8 -s ours am: 586137531f -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2045753
Change-Id: Ib227ce8e903856f418cab9ba207da9685ae4c1a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:21:31 +00:00
13a2fe7b98
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e199dfaf47 -s ours am: 86627586b2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17422265
Change-Id: I16ddaecbe4954760cdef6337519286f6b6f67a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:20:41 +00:00
3e427bcd46
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fba444664 -s ours am: 609b9fed35 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17422265
Change-Id: I8c11af19950fa082f6369f77efdcb45183aad655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:20:40 +00:00
95a9e02f3e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c53b90fcf9 -s ours am: d5b5be48cc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17422119
Change-Id: I4e8d6f103fdcc875341d15783d417fb022ac22dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:18:45 +00:00
d7483e2691
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3c6ff41f9 -s ours am: a27a229049 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17422119
Change-Id: I6ea70ab7dd89c7f2e62b6c458c5da968392f2502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:18:43 +00:00
586137531f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a39289296 -s ours am: 59b68fedf8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2045753
Change-Id: Ie8ad816c17a424a9a3f5876cadb29f4d229d6341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:17:22 +00:00
4793962dbe
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4383a121dd -s ours am: 089bd81a7c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17422264
Change-Id: I70b39d8d80e2bb0dd3cd15bf154213aa31a2c605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:09:26 +00:00
59b68fedf8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a39289296 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2045753
Change-Id: I3f7aa7b31e8d309768f96c8874a2168f253c1034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:00:59 +00:00
86627586b2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e199dfaf47 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17422265
Change-Id: I73f52831ceba608ab5f29175bd4fd71bfb38d3ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:55:30 +00:00
609b9fed35
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fba444664 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17422265
Change-Id: I1451535aa6bed986046eee21fef0ffd060a62878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:55:28 +00:00
d5b5be48cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c53b90fcf9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17422119
Change-Id: I2bcbac2a0ca9666da9cdc362a5e0a5b1d88e7cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:51:19 +00:00
a27a229049
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3c6ff41f9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17422119
Change-Id: I38fbc26b71c54a3d68639463aba4d3221802e707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:51:17 +00:00
089bd81a7c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4383a121dd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17422264
Change-Id: Iee96bec1d10b913391c312a873414d87ad6f3ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:44:26 +00:00
e199dfaf47
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-03-28 06:26:06 +00:00
c53b90fcf9
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-03-28 06:25:58 +00:00
4a39289296
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I56a8bd8e07ace7a74959d5d2ce44f6e3958f5ff2
2022-03-27 01:51:54 +00:00
1fba444664
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8d779119f73670085b6e6515612d7bb39d59d476
2022-03-26 23:09:45 +00:00
4383a121dd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9d23f98b7ccc9f9b28d9a6e3ca007d03ee92b3b6
2022-03-26 23:09:08 +00:00
a3c6ff41f9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iefe2598fd1b07b6132dfda76044787a8284efb0e
2022-03-26 23:08:39 +00:00
802ecf6f64
Merge "Fix issue with camera overlapping split staging UI" into tm-dev am: db92b5d73f am: e14b8a593a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17311863
Change-Id: I86a5da698fa447c6d3ddc31f9da446d9de6025be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-26 20:19:35 +00:00
e14b8a593a
Merge "Fix issue with camera overlapping split staging UI" into tm-dev am: db92b5d73f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17311863
Change-Id: I345286efaf51783d47bd6fb26968e284d5d085ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-26 20:05:54 +00:00
c9605801b4
Merge "Fix issue with camera overlapping split staging UI" into tm-dev am: db92b5d73f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17311863
Change-Id: Ied9a9abadf13813a3c7ef9ea40b342640a0d04ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-26 20:05:44 +00:00
db92b5d73f
Merge "Fix issue with camera overlapping split staging UI" into tm-dev
2022-03-26 19:41:48 +00:00
82a04f427b
[automerge] Fix issue with camera overlapping split staging UI 2p: b8eeb41ee0 2p: 8846338a7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17311863
Change-Id: I4dcb66f8b2f8b1e138623007fdf702144afc3c8c
2022-03-26 00:39:44 +00:00
8846338a7c
[automerge] Fix issue with camera overlapping split staging UI 2p: b8eeb41ee0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17311863
Change-Id: Ib54908a8a30c03e7e4b1b81dc6f3ad315d4dbb75
2022-03-26 00:39:32 +00:00
b8eeb41ee0
Fix issue with camera overlapping split staging UI
...
Fixes an issue on some devices where initiating a split in Overview would cause an icon to be placed partly under the camera cutout.
Fixed by adding some padding to FloatingTaskView#mSplitPlaceHolderView, so that it always respects the device's insets.
Fixes: 220997064
Test: Manual
Change-Id: I7270bde3320f562519ea8e36a38e49609e0d6cd7
2022-03-25 16:31:46 -07:00
ab1ca2886c
[automerger skipped] Merge "RESTRICT AUTOMERGE Hide keyboard when launcher is resumed for misbehaving apps" into sc-v2-dev am: bc46f69aff am: adfe503a9f -s ours am: b1faf1f4b3 -s ours am: 4b96f0c3b0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17223256
Change-Id: I74bdb1258c2d3eaabfb9f54374447863973cdbaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 23:25:34 +00:00
ba491eb360
Merge changes from topic "presubmit-am-aa9635a5cca34b62b554abab1bb81b7d" into sc-v2-dev-plus-aosp am: ce7ce0ab13 am: 54b28995f1 am: c99457488e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17223256
Change-Id: I8efd3bbedf92860ff4e14d2ab658fbcaedd24dca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 23:25:16 +00:00
70e6bf09d8
[automerger skipped] [automerge] RESTRICT AUTOMERGE Hide keyboard when launcher is resumed for misbehaving apps 2p: 1ccb68a9fd am: 0cc9eb8e83 -s ours am: 9814da4112 -s ours am: 367417e5d4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17223256
Change-Id: I098272b51230401ec3dfaa98784b78cf4a447fdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 23:25:15 +00:00
4b96f0c3b0
[automerger skipped] Merge "RESTRICT AUTOMERGE Hide keyboard when launcher is resumed for misbehaving apps" into sc-v2-dev am: bc46f69aff am: adfe503a9f -s ours am: b1faf1f4b3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17223256
Change-Id: Ifa3f1311deb9aae858a39a420e4fe441f38f8266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 23:09:50 +00:00
9abb5ef7bc
[automerger skipped] Merge "RESTRICT AUTOMERGE Hide keyboard when launcher is resumed for misbehaving apps" into sc-v2-dev am: bc46f69aff am: adfe503a9f -s ours am: b1faf1f4b3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17223256
Change-Id: Ibcbc6b4d3996b82aa678441ab628a8606bb76cf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 23:09:48 +00:00
c99457488e
Merge changes from topic "presubmit-am-aa9635a5cca34b62b554abab1bb81b7d" into sc-v2-dev-plus-aosp am: ce7ce0ab13 am: 54b28995f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17223256
Change-Id: I3733f894058593157137be0cc3bb9be283901927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 23:08:44 +00:00
367417e5d4
[automerger skipped] [automerge] RESTRICT AUTOMERGE Hide keyboard when launcher is resumed for misbehaving apps 2p: 1ccb68a9fd am: 0cc9eb8e83 -s ours am: 9814da4112 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17223256
Change-Id: Ia4d43461bc81b2fb9106dc266f2e750f7694a947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 23:08:43 +00:00
a3d806400e
Merge changes from topic "presubmit-am-aa9635a5cca34b62b554abab1bb81b7d" into sc-v2-dev-plus-aosp am: ce7ce0ab13 am: 54b28995f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17223256
Change-Id: Iefcb81ca233a748a27b3e81035b407e988db36f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 23:08:30 +00:00
cbd1bc9687
[automerger skipped] [automerge] RESTRICT AUTOMERGE Hide keyboard when launcher is resumed for misbehaving apps 2p: 1ccb68a9fd am: 0cc9eb8e83 -s ours am: 9814da4112 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17223256
Change-Id: If798bfa2009588885fef1fb83b1b2313e2596657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 23:08:28 +00:00
b1faf1f4b3
[automerger skipped] Merge "RESTRICT AUTOMERGE Hide keyboard when launcher is resumed for misbehaving apps" into sc-v2-dev am: bc46f69aff am: adfe503a9f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17223256
Change-Id: Ic115a1eb93c284c08707265a7dcb70189ba16a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 22:53:26 +00:00
54b28995f1
Merge changes from topic "presubmit-am-aa9635a5cca34b62b554abab1bb81b7d" into sc-v2-dev-plus-aosp am: ce7ce0ab13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17223256
Change-Id: I3ac5372c24cc6d45db1f36462dbd5ce13d4e545e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 22:53:18 +00:00
9814da4112
[automerger skipped] [automerge] RESTRICT AUTOMERGE Hide keyboard when launcher is resumed for misbehaving apps 2p: 1ccb68a9fd am: 0cc9eb8e83 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17223256
Change-Id: I140ee8ab4509038c58e2d51baafe792fd1167118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 22:53:17 +00:00
adfe503a9f
Merge "RESTRICT AUTOMERGE Hide keyboard when launcher is resumed for misbehaving apps" into sc-v2-dev am: bc46f69aff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17223256
Change-Id: I5d6b6505f27d2f7a30828867cb84df311680e16c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 22:52:53 +00:00
9a9b870cdf
Merge "Replace consumeNextDraw with SurfaceSyncer" into tm-dev am: ba653b3b92 am: d892844f28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17262739
Change-Id: Ic4b62b5a8abce750f1e155bdc059d7c8d95f59c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 22:47:44 +00:00
ce7ce0ab13
Merge changes from topic "presubmit-am-aa9635a5cca34b62b554abab1bb81b7d" into sc-v2-dev-plus-aosp
...
* changes:
[automerge] RESTRICT AUTOMERGE Hide keyboard when launcher is resumed for misbehaving apps 2p: 1ccb68a9fd
2022-03-25 22:37:47 +00:00
bc46f69aff
Merge "RESTRICT AUTOMERGE Hide keyboard when launcher is resumed for misbehaving apps" into sc-v2-dev
2022-03-25 22:37:47 +00:00
d892844f28
Merge "Replace consumeNextDraw with SurfaceSyncer" into tm-dev am: ba653b3b92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17262739
Change-Id: I6fd83d340815c131cf239f774926ab981c0a6767
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 22:25:20 +00:00
7ab7a51b16
Merge "Replace consumeNextDraw with SurfaceSyncer" into tm-dev am: ba653b3b92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17262739
Change-Id: Ia37bddc2194aa12f3897e533f907a45dcda0c7e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 22:24:52 +00:00
Bill Yi
TreeHugger Robot
Jeremy Sim
Presubmit Automerger Backend
Chavi Weingarten