Commit Graph

96455 Commits

Author SHA1 Message Date
Bill Yi
bd5b6c04b8 Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-qpr1-dev am: 6553465417 am: b1c97edfbf am: 72fdb0b8aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516

Change-Id: I687280e0948868ee22628ac9e915f38653233c2a
2021-09-27 16:41:11 +00:00
Bill Yi
c367f280d5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163 am: 3732defccb -s ours am: 9ffcace688 -s ours am: dc077e2701 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ea1fd54efcd994abe5dc828f0e843fa583970a9
2021-09-27 16:41:09 +00:00
TreeHugger Robot
1df1581871 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours am: 16ab663f53 -s ours am: 3d98b16f9f -s ours am: 6bd56eb45e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8860132f459dd8f4322dbc998baca9ed7a1ea177
2021-09-27 16:39:51 +00:00
Bill Yi
da00c1923b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours am: f78bbdeedc -s ours am: cd6592d352 -s ours am: bab113a283 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94b676ae22028376d3b45d0c5c3b2e5bab3f8826
2021-09-27 16:38:07 +00:00
TreeHugger Robot
0e0139ec66 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: de59a250f8 -s ours am: d508fbf43b -s ours am: 3c2091fc40 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0fb4a6244a5c4065d50924f7ac46720e15edcaec
2021-09-27 16:36:58 +00:00
TreeHugger Robot
42f9901966 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: f337947e27 -s ours am: d263a1305d -s ours am: cc53ea6c8d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I206a18a046e9e04dd82c4fc42031710fe8621c35
2021-09-27 16:35:17 +00:00
TreeHugger Robot
a6405b71a8 Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev am: cc1cc9a5f7 am: 6a9d8bc5bc am: fba9d96a43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895168

Change-Id: Ida5d3110bcd1c3e981cda2fcb30d782f8ee20ca8
2021-09-27 16:31:24 +00:00
Bill Yi
9cd92a0212 Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev am: 7378aac868 am: 61e7977aaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537

Change-Id: Ief847629af5c6cddcdc6ce0e9d8ccb678651243e
2021-09-27 16:22:18 +00:00
Bill Yi
f983612681 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b am: fe3544e435 -s ours am: e605139474 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba07514c3f1d8cd8fc1e86ec51534b357e5f00cc
2021-09-27 16:22:17 +00:00
Bill Yi
fe5fb6323f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49ce6473d6 -s ours am: cf07eec3b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie7a9e76352a0813310c3e00f625593bec33d5227
2021-09-27 16:22:03 +00:00
Julia Reynolds
f002a2b527 Always return the same result code in access screens am: 1aff9c726a am: c86d3d5218
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15908133

Change-Id: Icc3081af08a294db546d019e14029f486837756f
2021-09-27 16:21:41 +00:00
Bill Yi
eb8f294624 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d -s ours am: 7e253fafe9 -s ours am: d7f9802a7a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55ed0274fd73722c1130674a24abd074f126ce30
2021-09-27 16:21:11 +00:00
Bill Yi
8ac488e457 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22 -s ours am: ee7f088a94 -s ours am: 386c12938e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ffc70b34d38613ffc67d8fcfc4ba8d1d1a366f0
2021-09-27 16:20:36 +00:00
Bill Yi
e4b5e15e28 Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev am: 1b857d20ac am: 51be62033b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513

Change-Id: I41adf219182614382c85bb30ec403f70a3a37f9d
2021-09-27 16:17:11 +00:00
Bill Yi
88861877a8 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f am: c038db5354 -s ours am: 1c3d6efc94 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id59d4b07bddfcc2191b82b03dc4218ef9ae9fead
2021-09-27 16:17:10 +00:00
Bill Yi
72fdb0b8aa Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-qpr1-dev am: 6553465417 am: b1c97edfbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516

Change-Id: I4dbe644a842081cf069442b908225e7c780272a8
2021-09-27 16:16:30 +00:00
Bill Yi
dc077e2701 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163 am: 3732defccb -s ours am: 9ffcace688 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5bbbf5a87272a8a10aeed59b109dee84741cb65
2021-09-27 16:16:29 +00:00
TreeHugger Robot
6bd56eb45e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours am: 16ab663f53 -s ours am: 3d98b16f9f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I95c86ffd31e5f214f9259508b41a66e12d6d6669
2021-09-27 16:15:46 +00:00
Bill Yi
bab113a283 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours am: f78bbdeedc -s ours am: cd6592d352 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ice4d669c4b3343a9d47f31657a411eba794eedb7
2021-09-27 16:15:11 +00:00
TreeHugger Robot
3c2091fc40 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: de59a250f8 -s ours am: d508fbf43b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8e935d3d323bf7f3acd6ceea700e38ad07742772
2021-09-27 16:14:26 +00:00
Curtis Belmonte
af9f653ff7 [automerger skipped] Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev am: 491ef413c3 -s ours am: d390efcddf -s ours am: 402512fd6c -s ours
am skip reason: Merged-In Ied4dbcb4a523f477c5ca1a9146d24751c6473f35 with SHA-1 73855e0a59 is already in history

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

Change-Id: I325a07a6647684384bd3326746e4d351c22c4c61
2021-09-27 16:11:39 +00:00
TreeHugger Robot
cc53ea6c8d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: f337947e27 -s ours am: d263a1305d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b6c6d59946ea2672a8ef378ca55ab12e42ef697
2021-09-27 16:10:05 +00:00
Bill Yi
61e7977aaa Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev am: 7378aac868
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537

Change-Id: I6ef621135279240a1064db3fce4ac6223357389b
2021-09-27 16:07:35 +00:00
Bill Yi
e605139474 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b am: fe3544e435 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia6f944e0662704852fdb1b3b6f97950da567b75a
2021-09-27 16:07:35 +00:00
Bill Yi
cf07eec3b7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49ce6473d6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I12048a123ef9fd2ade0d46bf21f6d92edf1aa210
2021-09-27 16:07:16 +00:00
Julia Reynolds
c86d3d5218 Always return the same result code in access screens am: 1aff9c726a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15908133

Change-Id: I328c2178b009849d67a9ab1c74b22af832e0ca3c
2021-09-27 16:07:00 +00:00
Bill Yi
d7f9802a7a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d -s ours am: 7e253fafe9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I05a0e7154acbfae745fdc30e21c92bdfa5565a89
2021-09-27 16:06:54 +00:00
Bill Yi
386c12938e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22 -s ours am: ee7f088a94 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ec2f945f7b4de46318cb1827f2518e84c5b3b43
2021-09-27 16:06:28 +00:00
Bill Yi
51be62033b Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev am: 1b857d20ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513

Change-Id: I66c83548d16ff74f6cda297126d4d3b3d02f47fe
2021-09-27 16:03:01 +00:00
Bill Yi
1c3d6efc94 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f am: c038db5354 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a6ca63c289c024df8fd06bf7ebccfa3e01892d6
2021-09-27 16:03:00 +00:00
Bill Yi
b1c97edfbf Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-qpr1-dev am: 6553465417
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516

Change-Id: I7d579952b68e25e8aa7562102170168adf184cdc
2021-09-27 16:02:26 +00:00
Bill Yi
9ffcace688 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163 am: 3732defccb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I83e1d3d3998f7bfc391d81b2449227a6b4504cfd
2021-09-27 16:02:25 +00:00
TreeHugger Robot
3d98b16f9f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours am: 16ab663f53 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I47e95d1208ad76d7d127d59cae65f90c37ad0b21
2021-09-27 16:01:42 +00:00
Bill Yi
cd6592d352 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours am: f78bbdeedc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02c98c805beba0b38cc36ca686ad9da5004d109b
2021-09-27 16:01:01 +00:00
TreeHugger Robot
fba9d96a43 Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev am: cc1cc9a5f7 am: 6a9d8bc5bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895168

Change-Id: Iaf4cdb97bda02f79664e76dff13191a71300c885
2021-09-27 16:00:50 +00:00
Curtis Belmonte
402512fd6c [automerger skipped] Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev am: 491ef413c3 -s ours am: d390efcddf -s ours
am skip reason: Merged-In Ied4dbcb4a523f477c5ca1a9146d24751c6473f35 with SHA-1 73855e0a59 is already in history

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

Change-Id: Id15b61aaaeab6f7e5ec0a1131eb91a1dec7767df
2021-09-27 16:00:19 +00:00
TreeHugger Robot
d508fbf43b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: de59a250f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5d59e69443e7d1424fbfb1b46eccc4ae9f373243
2021-09-27 15:59:15 +00:00
TreeHugger Robot
d263a1305d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: f337947e27 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id1f0095a947ea075fc6d5a88a57a57ef11962d5d
2021-09-27 15:57:26 +00:00
TreeHugger Robot
6a9d8bc5bc Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev am: cc1cc9a5f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895168

Change-Id: I5c6bd25d10088435a5f41010d825c5baf172a778
2021-09-27 15:49:47 +00:00
Curtis Belmonte
d390efcddf [automerger skipped] Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev am: 491ef413c3 -s ours
am skip reason: Merged-In Ied4dbcb4a523f477c5ca1a9146d24751c6473f35 with SHA-1 73855e0a59 is already in history

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

Change-Id: I1c8aa676a3f9baff6e314bdd70c6f7bd26466e4c
2021-09-27 15:43:43 +00:00
Bill Yi
c7b20e5be7 Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev am: 7378aac868 am: 397b66c992 am: 863e1394dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537

Change-Id: I6585df5d64cab60d7e2a25c0313ff61a222096f8
2021-09-27 15:21:34 +00:00
Bill Yi
39677767e3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b am: fe3544e435 -s ours am: 58cf11a21a -s ours am: af535cc8cf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I61e40ec8e4108c179ff8544c08380ca23d54e8e9
2021-09-27 15:21:33 +00:00
Bill Yi
0a6c573391 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b am: 7245d9f02a -s ours am: 797ea65d28 -s ours am: 50206b8664 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I084cd8986e913e04357db210700f5c6b7d23bbfb
2021-09-27 15:20:38 +00:00
Bill Yi
863e1394dd Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev am: 7378aac868 am: 397b66c992
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537

Change-Id: I655e66620f4062b04eb217b73171e541de7828de
2021-09-27 15:07:04 +00:00
Bill Yi
af535cc8cf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b am: fe3544e435 -s ours am: 58cf11a21a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I33f58c803e225c4de893091ad13bef78c3e487f8
2021-09-27 15:07:04 +00:00
Bill Yi
50206b8664 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b am: 7245d9f02a -s ours am: 797ea65d28 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I234e5e7e6064ae8f9ac08d4acc378112e2aed823
2021-09-27 15:05:59 +00:00
Bill Yi
397b66c992 Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev am: 7378aac868
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537

Change-Id: I038f654fef5583fcd295d5c9aa263a73b4bf1a40
2021-09-27 14:50:31 +00:00
Bill Yi
58cf11a21a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b am: fe3544e435 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia888ce7e89c8e65e0915496c446d54e1ce07abc0
2021-09-27 14:50:29 +00:00
Bill Yi
797ea65d28 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b am: 7245d9f02a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ba326f60d727b1941260042ef9c2dbe45bc3fe7
2021-09-27 14:50:00 +00:00
Bill Yi
082d6f465e Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-mainline-prod am: f291d21a60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537

Change-Id: I49c5f55c013edcaf55ef8c3a3f0cce4914d110d5
2021-09-27 14:40:54 +00:00