Bill Yi
39812e84c0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib6505319ebf6b05ecfee3e8fd410a0052a9c6b62
2021-09-28 09:08:38 +00:00
Bill Yi
069684e925
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5025bf1696bea34629632b29351fc463f33ef27d
2021-09-28 09:04:57 +00:00
Bill Yi
43b9cb669c
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: Iea597fedb4bf06eae6760f6d313bc8f7909f2077
2021-09-28 09:01:34 +00:00
Bill Yi
a27f0eaf3d
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729
Change-Id: I0ab870320ff4498bd159cef7c9659eef3ce00139
2021-09-28 09:01:33 +00:00
Bill Yi
3769790fed
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5cf6feb89d6b5418866abcb32e14d00eaaae73ef
2021-09-28 09:01:22 +00:00
Xin Li
c41a577e37
DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged
...
Merged-In: Ibe8d1224361b31f6dfb782b5400d3ff6aad5e77f
Change-Id: I90b2538fb0737a35170b87864c776d94f575418f
2021-09-28 07:55:18 +00:00
YUKAI HUNG
8f2938221a
[automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef
-s ours am: d9db89af86
-s ours
...
am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919139
Change-Id: I04b9ecf8bf34eaa52aee9cb2e176c0de95024e9b
2021-09-28 07:53:44 +00:00
YUKAI HUNG
f4d84faee7
Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0
am: 0c99e2b1c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140
Change-Id: I9d596ccce1459e92c244fb013e3933c0f357ffb8
2021-09-28 07:53:39 +00:00
YUKAI HUNG
301bdd05d4
[automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef
am: 5e32dec664
-s ours
...
am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919139
Change-Id: Id1c00fe8ff9ad03edb8392331fd9613c07296197
2021-09-28 07:53:14 +00:00
YUKAI HUNG
3d6fc7d275
Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0
am: 4f513d7237
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140
Change-Id: I235cc4cb1dfabccdcb901e2de5eca1a33a237ad0
2021-09-28 07:53:07 +00:00
YUKAI HUNG
5e32dec664
Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919139
Change-Id: I92e32ec565c45d58b28c1430693f5fba11780844
2021-09-28 07:30:26 +00:00
YUKAI HUNG
d9db89af86
[automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef
-s ours
...
am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919139
Change-Id: I176606ea2e056d6cb109fdf4dc03b2fe7ceffdcb
2021-09-28 07:30:19 +00:00
YUKAI HUNG
0c99e2b1c8
Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140
Change-Id: I71ccb502dc5e7697b5f54daa803a56bba1e2c565
2021-09-28 07:30:14 +00:00
YUKAI HUNG
4f513d7237
Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140
Change-Id: Icdc5d87aa5f41ab32fc546d0bd513d505bcebd51
2021-09-28 07:30:13 +00:00
YUKAI HUNG
36072e86ef
Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev
2021-09-28 07:19:59 +00:00
YUKAI HUNG
4a4f13d5b0
Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev
2021-09-28 07:12:01 +00:00
PETER LIANG
7260fe0330
Merge "Add the max height restriction into the illustration view." into sc-v2-dev am: 65faee72f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15809052
Change-Id: Id9e4ca6f0c53a8924b75c7c31120d9776f9469de
2021-09-28 05:58:52 +00:00
PETER LIANG
65faee72f5
Merge "Add the max height restriction into the illustration view." into sc-v2-dev
2021-09-28 05:43:21 +00:00
TreeHugger Robot
209210b0b6
Merge "Ues permission to protect DeepLinkHomepageActivity" into sc-v2-dev am: 244e0f536b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895171
Change-Id: I07b2b389806a8eea5093c8b3bb8035f25cf26789
2021-09-28 04:38:50 +00:00
TreeHugger Robot
244e0f536b
Merge "Ues permission to protect DeepLinkHomepageActivity" into sc-v2-dev
2021-09-28 04:23:19 +00:00
Curtis Belmonte
52d3b2b802
Make biometric setting toggles show dynamic auth types am: a9c582262e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15925915
Change-Id: I7e254e16a0c2de4b891f287f2339d4d12f603efb
2021-09-28 01:13:53 +00:00
Curtis Belmonte
a9c582262e
Make biometric setting toggles show dynamic auth types
...
Updates the preference toggles shown on the combined biometric settings
screen to indicate which types of biometric sensor (e.g. face and/or
fingerprint) each setting applies to. This is done by checking the
maximum registered strength for each type of sensor.
Test: Manual
Bug: 193714498
Bug: 201306569
Change-Id: I1f27bbe1fdd172ebc899c3c5f1daef9095b338bd
2021-09-27 15:55:43 -07: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
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