TreeHugger Robot
c2b55a3690
Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev am: 55e91da24e
am: ff1617a8fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: I5b9860883523fbdc9997aa04c4514c1f68af556c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:12:59 +00:00
Bill Yi
254c52e64c
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0
am: 5a7f4fcb00
-s ours am: c5dc2de7c5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: Ie61dd13e90ba68184b4c0c14a3aa619c2aea5990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:12:58 +00:00
Bill Yi
4801f9a9aa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 89a0c5fb00
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17746001
Change-Id: I55225551206e9b9b72a15fd08fd09de6bfb4c06f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:12:20 +00:00
Bill Yi
98baf75c26
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8fac9ad72b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17746001
Change-Id: I110823dbe4bfacea28daa5efef2674095146af55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:12:19 +00:00
Bill Yi
82934365ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8d00d149a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745185
Change-Id: Ic43ade7c8b1381d4d14649991c2fc699a2173a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:12:01 +00:00
Bill Yi
e9d32de304
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2cac6464
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745185
Change-Id: Ic98ec3cfab399494dc1d32c33728fca5f1c337f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:12:00 +00:00
Bill Yi
cc2bc7f30b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b0765d9675
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745993
Change-Id: Ic68a7731e2521379d1665c097261784e6c1519ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:08:24 +00:00
Bill Yi
f1bbf9ff75
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3158f2f365
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745993
Change-Id: If4003271393c679a55163d6ea7ca6a0e10b22d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:08:16 +00:00
Bill Yi
ee6033af75
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 08549ed959
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17746569
Change-Id: I88b70dc5e038e9b9c95bef55acf3653a93483156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:06:12 +00:00
Bill Yi
01ef39c8b1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5491463fe6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17746569
Change-Id: I7df2ca00922b5dbbd4cdddc4913215669053c457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:06:09 +00:00
TreeHugger Robot
d22b43c6a5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745187
Change-Id: Ib8d08684f79433ec17dfad8daf29de4e23b28eb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:47:26 +00:00
Bill Yi
812e79c8cf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745187
Change-Id: Ic507bfd58ddae3eef0b30505327b18ceac24e676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:47:24 +00:00
Bill Yi
35b98a573e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b67694c1cb
-s ours am: 20efc0cc64
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745186
Change-Id: I79c3fb4cbe83a82d9c83a3c2ae028037ebf79b34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:47:17 +00:00
Bill Yi
57e6a29f1a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b67694c1cb
-s ours am: 20efc0cc64
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745186
Change-Id: I27a6f80388bbf495a621c9323c3e21d905773f8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:47:16 +00:00
Bill Yi
d700cfe212
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384
-s ours am: 4b073cf421
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745186
Change-Id: I8151cc6183dee4aca9e57a8884ef975c08f38f22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:47:15 +00:00
Bill Yi
bcf07d3494
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384
-s ours am: 4b073cf421
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745186
Change-Id: I8aebed68ff4e19df907c0c16c056c593b8fd78b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:47:15 +00:00
TreeHugger Robot
c53da610b2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17746570
Change-Id: If3fcaae0791677a5244d0006375b38f09847194a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:47:15 +00:00
Bill Yi
57b6374513
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17746570
Change-Id: I1a89457b55725eb781c4106d2a15ee53a15d7dd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:47:01 +00:00
TreeHugger Robot
1fd59e05d9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350
-s ours am: 0312b67407
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: Ied28975e9ee048034465f7a680b2349d52133e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:46:03 +00:00
TreeHugger Robot
707734caa1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350
-s ours am: 0312b67407
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: I529b821168f8e3be3592b34579be9c2759af189a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:45:39 +00:00
Lucas Silva
f8c7a84eb8
Merge "Add hyphenation to customize button text." into tm-dev am: b31dbbb1cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17758405
Change-Id: I087523825288400c738a188c04ac5d9bea53a3da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:45:16 +00:00
TreeHugger Robot
e9c60d9d72
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2212edb907
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745188
Change-Id: I504a845295c3f73bf08f3f26e464c412789f36f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:45:00 +00:00
Bill Yi
942891fc3c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23f2bfb3a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745188
Change-Id: I427dcfa9066828733b05add13eaff191c9d0180b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:44:59 +00:00
Lucas Silva
2e5ef5b243
Merge "Add hyphenation to customize button text." into tm-dev am: b31dbbb1cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17758405
Change-Id: I2516875810ba4edae05d1daad596b1933606aae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:44:32 +00:00
TreeHugger Robot
0ec6ee3588
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2880f9c765
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745995
Change-Id: Ic21ba199682d8fbdb941775739ac79a2b1b9c7a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:44:08 +00:00
Bill Yi
da6144dcbd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b31a221ace
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745995
Change-Id: Iff358f9dff5601de01a21e17ccc59d050183d9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:44:07 +00:00
TreeHugger Robot
756335c5c4
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a
am: de1481d68a
am: 2dd28aa043
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745804
Change-Id: Ibb71ae9df63041a0dc53ca7acd46a4bc9936cae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:44:00 +00:00
TreeHugger Robot
36d4b842e3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2212edb907
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745188
Change-Id: I5792ad63d89d471affddece516ca08d06bb78737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:43:40 +00:00
Bill Yi
1c67732678
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23f2bfb3a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745188
Change-Id: I7a762b8a1c98dbbcd6f3194bd09dad319e2b4eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:43:39 +00:00
TreeHugger Robot
ff58aef35b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2880f9c765
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745995
Change-Id: I0fb1f858e0c0e847a3854b89ac7c871448b7e6fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:42:02 +00:00
Bill Yi
52fcdc6fdc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b31a221ace
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745995
Change-Id: I468e46e474d51c23548dede40b5ab66efa0a3a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:42:01 +00:00
Quang Luong
0a95476a03
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4
am: 0bbdf3a983
am: 0f1e422f99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256
Change-Id: I1f3be2b494354d63d2314c55364e7e7192cfcecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:41:57 +00:00
TreeHugger Robot
ff1617a8fb
Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev am: 55e91da24e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: I932f20402f1e84ad4f3e388996600f283e7aba16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:40:20 +00:00
Bill Yi
c5dc2de7c5
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0
am: 5a7f4fcb00
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: Ib60d65d3794dcd1f814bc8cc0c96bf83c47729df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:40:19 +00:00
Bill Yi
20efc0cc64
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b67694c1cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745186
Change-Id: I9ba51c4cd89e5182cdc096a4b18179e5a641405e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:40:13 +00:00
Bill Yi
4b073cf421
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745186
Change-Id: I0ddd79cb6636eba32d51861c90fd5f5bfcf1bacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:40:08 +00:00
TreeHugger Robot
fe3d04de86
Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev am: 55e91da24e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: I9cecbd87511cb97a05fff121fac736e26f140ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:39:59 +00:00
Bill Yi
7044a2ee63
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0
am: 5a7f4fcb00
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: Ib0ae216d77188d560933313a35a1b02196a22737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:39:58 +00:00
TreeHugger Robot
0312b67407
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: I26e318e71a59517302ae0db449f649f586766093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:39:34 +00:00
Lucas Silva
b31dbbb1cf
Merge "Add hyphenation to customize button text." into tm-dev
2022-04-14 17:39:13 +00:00
Victor Truong
05e824e9e0
Set Active dream to not be clickable when active.
...
Setting Active dream to not be clickable to stop Talkback from prompting
user to "Double tap to activate".
Bug: 228573813
Test: Manually tested on device.
Change-Id: I5f646bcf82d8c4172127f0739b6c0d7af890dabb
2022-04-14 17:38:26 +00:00
Bill Yi
8d00d149a6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-14 17:17:57 +00:00
Bill Yi
b67694c1cb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-04-14 17:17:45 +00:00
Bill Yi
b0765d9675
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-14 17:17:29 +00:00
Bill Yi
89a0c5fb00
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-04-14 17:16:07 +00:00
Bill Yi
08549ed959
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-04-14 17:14:41 +00:00
TreeHugger Robot
940c2d25fb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-14 17:12:57 +00:00
TreeHugger Robot
b299745a6c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-04-14 17:12:54 +00:00
TreeHugger Robot
2212edb907
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-14 17:10:29 +00:00
TreeHugger Robot
2880f9c765
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-04-14 17:08:33 +00:00