TreeHugger Robot
a5a1c5710e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours am: d22b43c6a5 -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: I6370b4b7c11bdb4d2514c601acd93b141060e7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:14:55 +00:00
Bill Yi
db2dfb95da
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours am: 812e79c8cf -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: I86f0b1dc43806b330b5d18f36aba3dea181b14ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:14:52 +00:00
TreeHugger Robot
f26007c8ef
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c -s ours am: c53da610b2 -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: Id50ca54e69d4273ef635cce3db7f15ded82a0163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:14:04 +00:00
Bill Yi
006db32086
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -s ours am: 57b6374513 -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: I511a9059ccf3c323d7eb7cc96438b3c27bff6bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:14:00 +00:00
TreeHugger Robot
b614bf28ad
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2880f9c765 -s ours am: 0ec6ee3588 -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: Ib71cad3874d96d31d0bf8aea04abf685e454996a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:13:45 +00:00
Bill Yi
f0890308c5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b31a221ace -s ours am: da6144dcbd -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: Iccf6e7b6d9995f5514c0c82db7d67b31052ca709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:13:43 +00:00
TreeHugger Robot
69929e2dcd
Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev am: 55e91da24e am: fe3d04de86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184
Change-Id: I2e24d1cbce2ac8bea5045f41156a534df5fd0c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:13:04 +00:00
Bill Yi
204786c737
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0 am: 5a7f4fcb00 -s ours am: 7044a2ee63 -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: I2dd09d9c797d630bf7953ef9eb89557012b9f4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 18:13:03 +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
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
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
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
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
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
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
b67694c1cb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-04-14 17:17:45 +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
TreeHugger Robot
55e91da24e
Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0
Import translations. DO NOT MERGE ANYWHERE
2022-04-14 17:08:18 +00:00
TreeHugger Robot
e3b581c350
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-04-14 17:08:18 +00:00
TreeHugger Robot
2dd28aa043
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a am: de1481d68a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745804
Change-Id: I5f6e6b48b9fd8c7ae26a0d43e49b6931c78633a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:55:52 +00:00
Yuri Lin
554ab1fe3e
Special handling for intent coming from "welcome" notification.
...
This notification is an introduction to new notification permission changes in T and is shown to the user upon upgrade; this change records that the user has seen/interacted with the notification already so we don't have to keep showing it.
This change essentially makes a copy of the existing functionality of NotificationAppListActivity, but meant only for access internally (so that neither the activity nor the associated action is exported/publicly accessible).
Bug: 225373531
Test: manual with the change that sends the notification
Change-Id: I20c6084652ea11a8d0a002a21561fe50b9cf5de3
2022-04-14 12:54:56 -04:00
Quang Luong
0f1e422f99
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4 am: 0bbdf3a983
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256
Change-Id: Ie30e4eccddb2ccd0c1cb22f4c235c83aa894980b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:53:45 +00:00
TreeHugger Robot
de1481d68a
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745804
Change-Id: I675e9e5e1100c91eb01639a020be65f0bdd47e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:34:59 +00:00
Quang Luong
0bbdf3a983
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256
Change-Id: I6839b69c92f10905e1386c0a4555a4c980eccebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 16:34:52 +00:00
TreeHugger Robot
37c2ac2c6a
Merge "Add 2 pixels to top of Advanced Options component" into tm-dev
2022-04-14 16:28:11 +00:00
Quang Luong
93ae7acbf4
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev
2022-04-14 16:14:21 +00:00
Tsung-Mao Fang
cf162bc514
Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5 am: de992a99f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17644388
Change-Id: I5bb37aab6ba314bca3db22a574dbe38d671e4d3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 15:26:00 +00:00
Bill Yi
6883e565c5
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-04-14 15:13:58 +00:00
Bill Yi
5f31fac340
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-04-14 15:08:42 +00:00