Commit Graph

99601 Commits

Author SHA1 Message Date
Bill Yi
96b65ea4c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours am: dcd2b90022 -s ours am: 5950ef489f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581993

Change-Id: I562acc3cc17334eeff5fe00e45bc72abf6250ae1
2022-01-09 05:51:29 +00:00
TreeHugger Robot
99adce0217 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4 -s ours am: 9cbff55146 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582001

Change-Id: I403b519123571c2849045b17c9211dff16b9bb15
2022-01-09 05:51:19 +00:00
Bill Yi
2f045532f8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours am: c6e9397fe4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581993

Change-Id: Iaf0ad09fe29f3bcf4854d2638fb091796a2f9161
2022-01-09 05:51:12 +00:00
TreeHugger Robot
73f4a6ef55 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cc94febb28 -s ours am: f2c222c977 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581997

Change-Id: I400750354cbecd804ae6d442d081d0c517ed7667
2022-01-09 05:51:01 +00:00
Bill Yi
6572de6e78 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f69d80aa34 -s ours am: 3710710bc5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582265

Change-Id: I126901224bd7f1dc3b98fb71b544dc76abdf36c3
2022-01-09 05:50:18 +00:00
TreeHugger Robot
73c95c1ac3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4 -s ours am: ad7ea804d8 -s ours am: 6437b8590b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582001

Change-Id: I94760890a5fbd36af6a210251279160f4d14d0fb
2022-01-09 05:48:21 +00:00
Bill Yi
9e22464ec0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours am: dcd2b90022 -s ours am: 9d02a7114f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581993

Change-Id: I25859b60d5a3d6add12471b4be91fcecf1d5cae1
2022-01-09 05:45:40 +00:00
TreeHugger Robot
f48a240945 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4 -s ours am: ad7ea804d8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582001

Change-Id: I3172d86558003edbeafd7dc8480ae7cb4cafd9fd
2022-01-09 05:36:59 +00:00
Bill Yi
5950ef489f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours am: dcd2b90022 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581993

Change-Id: Ie4733b05be99789d6564e3d1e93fcdac87dfa75c
2022-01-09 05:36:53 +00:00
TreeHugger Robot
6437b8590b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4 -s ours am: ad7ea804d8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582001

Change-Id: I47fad93803ce4dc9461c8f1c763a182641cfa157
2022-01-09 05:36:09 +00:00
TreeHugger Robot
661c9295b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cc94febb28 -s ours am: fbc1a45d59 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581997

Change-Id: I7b97577a11da6b2381d86dced3e16e31e3e4d78c
2022-01-09 05:35:52 +00:00
TreeHugger Robot
f2c222c977 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cc94febb28 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581997

Change-Id: I745c361ee221f9a9dbfe2275de5b095fda0cdfb0
2022-01-09 05:35:49 +00:00
Bill Yi
9d02a7114f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours am: dcd2b90022 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581993

Change-Id: I4a20b42fe8fd94ddb726ab7e7364f371db547370
2022-01-09 05:35:49 +00:00
Bill Yi
422501a5a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f69d80aa34 -s ours am: edc751bbaa -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582265

Change-Id: I6e026a5b12c8c4dd389fb6e27263a30d56e9ea01
2022-01-09 05:35:39 +00:00
TreeHugger Robot
fbc1a45d59 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cc94febb28 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581997

Change-Id: Id72341e0cb3eb113002eb574ac48caa738a79c32
2022-01-09 05:35:24 +00:00
TreeHugger Robot
8f3bd108d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9dd4542560 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582266

Change-Id: I1db59b3b259e08f46b4584bafe39458b2522e5a0
2022-01-09 05:34:59 +00:00
Bill Yi
edc751bbaa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f69d80aa34 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582265

Change-Id: I0799eb79c1f6c4bae9bdf6ed1c639e9de03350d4
2022-01-09 05:34:42 +00:00
TreeHugger Robot
ad7ea804d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582001

Change-Id: Ibf86012a9197656e463869fa55785efadf1230c8
2022-01-09 05:34:35 +00:00
Bill Yi
3710710bc5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f69d80aa34 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582265

Change-Id: Idd3f900e12d87f0da38157f8ba2a130c9e058ae5
2022-01-09 05:34:35 +00:00
Bill Yi
dcd2b90022 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581993

Change-Id: I07cdae04675495c5ed06cd0effdf2381939e54f2
2022-01-09 05:34:28 +00:00
TreeHugger Robot
0f91d91d56 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: da2e65e4ee -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581998

Change-Id: I8eb8acddb66b72c37413d62585b3a735287c4f21
2022-01-09 05:34:13 +00:00
TreeHugger Robot
9cbff55146 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582001

Change-Id: I39f63d24d522944a0828b16b8fa2ee406e49b2fa
2022-01-09 05:33:32 +00:00
Bill Yi
c6e9397fe4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581993

Change-Id: Ic3cc95951c68696f7556bd21bf67d91b37f6e8cf
2022-01-09 05:33:14 +00:00
TreeHugger Robot
212e37eb95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 577ca44e65 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581990

Change-Id: I5f16a5f4c30bbd5c293e08a13d573c6e19b4f686
2022-01-09 05:26:20 +00:00
TreeHugger Robot
fad8ac95a4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-09 05:14:26 +00:00
TreeHugger Robot
cc94febb28 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-09 05:14:18 +00:00
TreeHugger Robot
9dd4542560 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-01-09 05:13:52 +00:00
TreeHugger Robot
da2e65e4ee Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-01-09 05:13:48 +00:00
TreeHugger Robot
577ca44e65 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-01-09 05:06:07 +00:00
TreeHugger Robot
186d5b6409 Merge changes from topic "presubmit-am-1386b0858a564df381b5c9793cb4de61"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0781839289
  Import translations. DO NOT MERGE ANYWHERE
2022-01-09 05:03:58 +00:00
Yasin Kilicdere
7eeb727614 Merge "Add logging for settings entrypoint to add supervised user." 2022-01-07 20:58:14 +00:00
Bill Yi
4cc514c3c3 [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3 -s ours am: 5ef6e53bf5 -s ours am: 6930ac9588 -s ours am: 9d0825f6bd -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1940736

Change-Id: I5a88db3c390939bd123b43d4800a3b47d0ff2f53
2022-01-07 18:57:05 +00:00
Bill Yi
9d0825f6bd [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3 -s ours am: 5ef6e53bf5 -s ours am: 6930ac9588 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1940736

Change-Id: I9f6e7ad04936045fed004c2b97ecbe1169491924
2022-01-07 18:34:09 +00:00
Bill Yi
6930ac9588 [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3 -s ours am: 5ef6e53bf5 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1940736

Change-Id: I5a9ec3301f4d4649584a57abc8d3776ae2e78311
2022-01-07 18:16:20 +00:00
Bill Yi
5ef6e53bf5 [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1940736

Change-Id: I08d291860f76cb1993aae826cb6bd85b4430e52e
2022-01-07 17:48:51 +00:00
Bill Yi
75205dc6b3 Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" 2022-01-07 17:29:12 +00:00
Yuri Ufimtsev
2fb7bac849 Exclude Privacy Settings from search if Safety Center is enabled
Test: manual

Bug: 206797394
Change-Id: I474064786642a7e772da03e13308a63f7dd2dd4b
2022-01-07 14:24:59 +00:00
PETER LIANG
20ec35ec34 Merge "Add new Text and reading options preference into the a11y settings." 2022-01-07 11:39:10 +00:00
Bill Yi
fbe6fd97b9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8b732b18aa1e28bd59972d3ad51f2fa00d0e7973
2022-01-07 10:32:46 +00:00
Bill Yi
f69d80aa34 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iec8d44a0966c47b347de5290f9a3bc5f5c54dc6c
2022-01-07 10:29:08 +00:00
Bill Yi
9fed0efc79 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I089bd7964eff40566f6e0e5f29419ffffd0e8525
2022-01-07 10:25:35 +00:00
Bill Yi
a23cb25511 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I82f24cc8798f2df1ddde782a9019178ca89d70e9
2022-01-07 10:21:29 +00:00
Bill Yi
64a765a14c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifcad6860e4664730c2d0e5826018623ab161db4a
2022-01-07 10:17:54 +00:00
Bill Yi
6ad216fce4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0a648477cbd18dc003cae1dfa61a3387d8f76536
2022-01-07 10:16:21 +00:00
Bill Yi
ac0bd999f1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If79c3e0fd0ebe9847befbf0f32184782cbc5f7e2
2022-01-07 10:14:50 +00:00
Bill Yi
966558f7f7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2a005207a81ddef8b2ea722187a9f4ab73ecb0d4
2022-01-07 10:13:18 +00:00
Bill Yi
a5c8abc5a2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I31226808bce791ecfc6ff0ea175022560229c069
2022-01-07 10:10:34 +00:00
Bill Yi
4067fbe481 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0781839289
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581988

Change-Id: Ibf06eb6cd3f6157f47d33644b41201b65a608b65
2022-01-07 10:07:17 +00:00
Bill Yi
0781839289 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6c759ce3bdcd7fa8e013aa4711412db766193cbd
2022-01-07 10:07:07 +00:00
Peter_Liang
79a29303ea Add new Text and reading options preference into the a11y settings.
1. Set visible as false until completely finish the feature.
2. This preference has no action temporally, and will continually integrate features into.

Bug: 211503117
Test: manual test
Change-Id: I1404e6eca6bd8246ae844f1a287e6c4872a8fded
2022-01-07 17:22:25 +08:00