4e9f80721e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8942bc90bf -s ours am: 0a77ac2558 -s ours am: df18d0f7a2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474028
Change-Id: Ic8fb7c0a3721790db0ae0de5734c4c1839167fbc
2021-12-16 16:25:07 +00:00
2331b30091
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9be15e2b85 -s ours am: 1adc711159 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474029
Change-Id: Ie1819042d99bf2b50c234d3ac2f1f0fbcb504972
2021-12-16 16:24:07 +00:00
41532f5d06
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 2cce776dc4 -s ours am: 40cf3b53cb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474032
Change-Id: Ie3afb7c1ebe0591d85083edd1025341a567b3ee9
2021-12-16 16:22:43 +00:00
c11ce9c9ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours am: b3a4a6139f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: Id38f06ba403d538a3c88d4565941aecf0eef2e37
2021-12-16 16:22:26 +00:00
c76b757798
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 384c30fa4c -s ours am: 9c07d79b28 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: I02e061bc2076cf59c415508b246c916f4c392b9e
2021-12-16 16:21:40 +00:00
6a04e85a40
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours am: 4d6831e2b9 -s ours am: 3ffaf3c71f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: I3ba0e9e102ad10dd007fdc0abf5522d381653d6d
2021-12-16 16:15:49 +00:00
f5721154da
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: d1841de078 -s ours am: 011e9314e6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474031
Change-Id: Ic1932e17d1140f9e55ae4dfacf61aacb55c590a0
2021-12-16 16:15:38 +00:00
ad0d18bd86
Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a" into sc-qpr1-dev am: cd30824c99 am: 63d5fd85e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: I210eb79849adf9f12545f7fab43e314e8aa78cec
2021-12-16 16:15:22 +00:00
2154f37847
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908 am: a0cf7967db -s ours am: 964665a000 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: Iff67c537c8d4faad2fe1c9f70cb2f2da874809f1
2021-12-16 16:15:21 +00:00
5dcb88cb71
Merge changes from topic "presubmit-am-2f8e16fe33c44e5196ee3ee1963fafb2" into sc-qpr1-dev am: 04162f05d7 am: e2e3340998
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: Ic7fcfc4f59ec430b2d8126dc72239f9c8f232682
2021-12-16 16:14:55 +00:00
4b2275537a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 384c30fa4c am: 439705b5a3 -s ours am: 2d4d5863b7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: I79133aa37949d7f78930cfb848a64bf9ec373b13
2021-12-16 16:14:52 +00:00
df18d0f7a2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8942bc90bf -s ours am: 0a77ac2558 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474028
Change-Id: I49d9fa06480cfbdafb358c95c04d09a0ebf116c2
2021-12-16 16:13:54 +00:00
3ffaf3c71f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours am: 4d6831e2b9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: Ie8afdf5787284f711960ea7edb124641edbaceb5
2021-12-16 16:11:57 +00:00
74713bf7fe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours am: 4d6831e2b9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: I4baef64d51053fa2d7a6f12bf3137d34de4bdb52
2021-12-16 16:11:50 +00:00
85064cbe20
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: d1841de078 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474031
Change-Id: I9aa58829f42179c3c4106b3636d0b3f16c04e078
2021-12-16 16:11:34 +00:00
011e9314e6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: d1841de078 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474031
Change-Id: I70958dc746e53154b9d9c58ee72c59a995ca7439
2021-12-16 16:11:32 +00:00
122f22518b
Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a" into sc-qpr1-dev am: cd30824c99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: I9c60650a3fceb5ee1ec7d073d640b82e01a6b455
2021-12-16 16:11:15 +00:00
63d5fd85e6
Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a" into sc-qpr1-dev am: cd30824c99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: I1e7e38f0fbaac4c1ac90ff2f040c2eadfc362f42
2021-12-16 16:11:14 +00:00
81d7f5cfa1
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908 am: a0cf7967db -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: I4e739ae331e86662dff1bdddb7f0567a520a6831
2021-12-16 16:11:10 +00:00
964665a000
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908 am: a0cf7967db -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: Ic4fac6992b03a6d95684e48d2c4c5233085d47f1
2021-12-16 16:11:09 +00:00
e2e3340998
Merge changes from topic "presubmit-am-2f8e16fe33c44e5196ee3ee1963fafb2" into sc-qpr1-dev am: 04162f05d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: Ia18da606589470e86ed75583ba30250f04237750
2021-12-16 16:10:07 +00:00
2d4d5863b7
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 384c30fa4c am: 439705b5a3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: Iab2bf266a7d1626fec28b44727d42500285a9fa7
2021-12-16 16:10:07 +00:00
62f10cad58
Merge changes from topic "presubmit-am-2f8e16fe33c44e5196ee3ee1963fafb2" into sc-qpr1-dev am: 04162f05d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: I99073edb152f165ca9340fbf54493a1062f7a6c3
2021-12-16 16:09:57 +00:00
53f35980bf
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 384c30fa4c am: 439705b5a3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: I001937bc8cb067689c7e2ab6719d1d9b2cedbd65
2021-12-16 16:09:55 +00:00
6247c73793
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8942bc90bf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474028
Change-Id: I040ca22ffbb2dc66b4bfd0bcedc488f95f20e41e
2021-12-16 16:06:49 +00:00
0a77ac2558
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8942bc90bf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474028
Change-Id: I4bf9a47db20f8bb7c00ad18162bb3c32375f25d9
2021-12-16 16:06:48 +00:00
4d6831e2b9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: Ic4119cd526e6601167751700d0107a788b25aecb
2021-12-16 16:06:23 +00:00
1adc711159
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9be15e2b85 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474029
Change-Id: Ica6d4f15d4dc117ed1223581e03c31348a75cb30
2021-12-16 16:05:41 +00:00
b3a4a6139f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: I628102a9469e07256e7fe9892e829c837fd8b0e5
2021-12-16 16:04:56 +00:00
9c07d79b28
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 384c30fa4c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: I9e2090d7ebf983dad4bd9d963ac154b78678059a
2021-12-16 16:04:37 +00:00
40cf3b53cb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 2cce776dc4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474032
Change-Id: I9748b3087811e1196c28e5033e4f9225e22792ea
2021-12-16 16:04:08 +00:00
d1841de078
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-12-16 15:50:25 +00:00
9be15e2b85
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-12-16 15:50:09 +00:00
ac3d83d6ae
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-12-16 15:48:32 +00:00
2cce776dc4
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-12-16 15:45:57 +00:00
649325ad1a
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-12-16 15:44:44 +00:00
cd30824c99
Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908
2021-12-16 15:44:44 +00:00
1a534e5929
Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce9080e2873b514189f1ce908
2021-12-16 15:44:44 +00:00
04162f05d7
Merge changes from topic "presubmit-am-2f8e16fe33c44e5196ee3ee1963fafb2" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 384c30fa4c
2021-12-16 15:44:27 +00:00
365560199f
Merge "Show Digital Wellbeing Banners for split tasks" into sc-v2-dev am: 8d25a0a363 am: 510d9060a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16459079
Change-Id: If24107dc1d3e0d83557da8409a891471e25fc979
2021-12-16 11:49:47 +00:00
510d9060a7
Merge "Show Digital Wellbeing Banners for split tasks" into sc-v2-dev am: 8d25a0a363
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16459079
Change-Id: Ia65e7ce8eabc0a9caa5892a5a8de0e14f2b70b73
2021-12-16 11:33:17 +00:00
8d25a0a363
Merge "Show Digital Wellbeing Banners for split tasks" into sc-v2-dev
2021-12-16 11:13:10 +00:00
ebf2cdd0f1
Show Digital Wellbeing Banners for split tasks
...
Fixes: 199936292
Change-Id: I38743d58f53a65ef717b1babc21ad1df2dc840a4
2021-12-15 22:19:02 -08:00
a1ca878a1c
[automerger skipped] Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" into stage-aosp-master am: b4bb645304 am: 3816453ca4 -s ours am: 985633b7c7 -s ours
...
am skip reason: Merged-In Ia2a677f3a3987751349bad951ff136b2d55f439f with SHA-1 12609edb72https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15854779
Change-Id: I644b49eabf3f2f8f3d20ec3c52e54341038930b6
2021-12-16 00:57:16 +00:00
84292da6c2
Merge "Save multiple RunningTaskInfo in GestureState" into sc-v2-dev am: 20102c3dd7 am: a51f394504
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16482597
Change-Id: If69bd5e02de59bdfe05a8f7fcc03a4ff235d4c41
2021-12-16 00:54:45 +00:00
368eb46da5
Merge "Set navBarDarkIntensity based on dark theme in SUW" into sc-v2-dev am: f9f90d6dc2 am: 5ebda13e05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16482607
Change-Id: I8babe4bae067d8feab9d80c41b48994a33bf19df
2021-12-16 00:50:57 +00:00
985633b7c7
[automerger skipped] Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" into stage-aosp-master am: b4bb645304 am: 3816453ca4 -s ours
...
am skip reason: Merged-In Ia2a677f3a3987751349bad951ff136b2d55f439f with SHA-1 12609edb72https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15854779
Change-Id: I99339ecb4faa457a2058f839d42502a98f5d1a8b
2021-12-16 00:50:17 +00:00
a51f394504
Merge "Save multiple RunningTaskInfo in GestureState" into sc-v2-dev am: 20102c3dd7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16482597
Change-Id: I189ae54406b2a7dc6337e55fac648ed4f671f8bb
2021-12-16 00:36:17 +00:00
5ebda13e05
Merge "Set navBarDarkIntensity based on dark theme in SUW" into sc-v2-dev am: f9f90d6dc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16482607
Change-Id: I74b54c03261a46041407878337aadcf2dd62f8cc
2021-12-16 00:32:55 +00:00
3816453ca4
Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" into stage-aosp-master am: b4bb645304
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15854779
Change-Id: I6b9efe278a1e6bb83f4a8f153a6a6da741d0e27f
2021-12-16 00:29:27 +00:00
Bill Yi
TreeHugger Robot
Vinit Nayak
Colin Cross