Commit Graph

85733 Commits

Author SHA1 Message Date
Jack Yu
b85416796d Do not let guest user disable secure nfc am: a579ca7554 am: 1009054124
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815

Change-Id: I9879ba034ae2b8d7a964a4d6c9d700bad55b636e
2022-01-28 22:31:38 +00:00
Jack Yu
1009054124 Do not let guest user disable secure nfc am: a579ca7554
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815

Change-Id: Ic68c6849bb65875aea6286d415c66ae8a9f57dfa
2022-01-28 22:19:10 +00:00
TreeHugger Robot
a4a8d64edc Merge "[Settings] SIM colors are referenced by getIntArray() within source code" into sc-v2-dev 2022-01-28 21:03:47 +00:00
Bill Yi
58acafcc42 Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev am: 7793bd6b17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348

Change-Id: Iec5a5e1458504100e8189ad99b6b459823b7e6e6
2022-01-28 03:13:54 +00:00
Bill Yi
e5a95e2c27 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0 am: 86cab2cd66 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8604a89393903f3f994f7be7cfae7b6e7f6d3900
2022-01-28 03:13:53 +00:00
Bill Yi
7793bd6b17 Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
  Import translations. DO NOT MERGE ANYWHERE
2022-01-28 02:54:43 +00:00
TreeHugger Robot
4636172136 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-01-26 16:53:16 +00:00
Bill Yi
30ee2e7136 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dab10d29f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I62e3fe5f3d402d641b715ebf75420984f987d223
2022-01-26 15:36:35 +00:00
Bill Yi
c556615f57 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic56844c2efc174d299775ff03b2abc3f10d49de9
2022-01-25 06:32:40 +00:00
Bill Yi
4dab10d29f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic26c56697a7c78fde677f39f63562fa8327d4b2d
2022-01-25 06:29:10 +00:00
Bill Yi
86cab2cd66 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
Blank merge reason: commit message contains skip directive

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

Change-Id: If1bb4c3824bdba9640309da80b4b7168b32076f3
2022-01-25 06:25:53 +00:00
Bill Yi
e4ca28a0d0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I09e6df9ed565dcd098d1b1a98c51786fe5d87785
2022-01-25 06:25:43 +00:00
Bill Yi
2953e0c45f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8e9c6c97c110158c929e9b80da1f105a6182644d
2022-01-25 06:18:14 +00:00
Jack Yu
a579ca7554 Do not let guest user disable secure nfc
Bug: 209446496
Test: manual
Merged-In: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
Change-Id: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
(cherry picked from commit d9e3e6e4b1)
2022-01-22 07:56:25 +00:00
Joshua Mccloskey
6a6fb6b78b Merge "Added lottie animations for udfps side/tip" into sc-v2-dev 2022-01-20 00:33:05 +00:00
Joshua Mccloskey
21a4342048 Added lottie animations for udfps side/tip
Bug: 209807883
Test: Verified animations show for multiple devices.
Change-Id: Ic63a0eca226309b92aa64cb4f80791ef179b8154
Merged-In: Ic63a0eca226309b92aa64cb4f80791ef179b8154
2022-01-19 20:47:42 +00:00
TreeHugger Robot
d24b5e76b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 572b59c465 -s ours am: e7e23fad18 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a498809155d4f5ec438dee622d1fd39bcf68a3f
2022-01-14 18:39:32 +00:00
TreeHugger Robot
e7e23fad18 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 572b59c465 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e677ef2a2c919b027b8c565e6b01be47d4724f4
2022-01-14 18:34:27 +00:00
Bill Yi
ed6a7764e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8 -s ours am: bbf27131c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8669d09a173bce2a7f640dae6bf8a970d51f85dc
2022-01-14 18:33:23 +00:00
Bill Yi
bbf27131c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I36a0e9655821f97c5fade9d1890c3987202db953
2022-01-14 18:33:17 +00:00
TreeHugger Robot
dc9cf72aab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 87e5157b5a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I905faea38be17bfb31c559f4a4757d41a1a49a9c
2022-01-14 18:33:11 +00:00
Bill Yi
9af90ac95e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d56130c5e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I75493e6cdc4f9e4d0a4b175e133d59d943b21f00
2022-01-14 18:32:41 +00:00
TreeHugger Robot
572b59c465 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-14 18:09:51 +00:00
TreeHugger Robot
87e5157b5a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-14 18:09:47 +00:00
Bill Yi
0eab9c02b9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I962c318f41adcf180b885f2052ce0ec4952edfb6
2022-01-14 09:22:25 +00:00
Bill Yi
a6f38c19f8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib7868c5698aef46813818165545a388552033564
2022-01-14 09:18:54 +00:00
Bill Yi
9d56130c5e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie7fde007b60291d37ac3283c0037c3717b2798be
2022-01-14 09:11:12 +00:00
Bill Yi
3bf676d7ce Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic57de1e9085d2e5ebc2a4eaaa38bdcbc1af70090
2022-01-14 09:09:42 +00:00
Bonian Chen
e936ffecf4 [Settings] SIM colors are referenced by getIntArray() within source code
SIM colors are referenced by getIntArray() within source code

Bug: 211956916
Test: build pass
Change-Id: Idefac365e750e454a2c3c98b2b4f17acbe143820
2022-01-14 05:56:35 +00:00
Bill Yi
0179fc901f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibe78ecd75a57eabe935572964ce4f941dcbe18d7
2022-01-14 03:46:33 +00:00
TreeHugger Robot
b03be4ee77 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours am: fc22f7f99f -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: Ib8c693ca5216a18a75857792387d780d7de163a6
2022-01-13 22:14:01 +00:00
TreeHugger Robot
fc22f7f99f [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: If75738f8e8c3e4e6febfd77710e81613978153f2
2022-01-13 22:02:06 +00:00
TreeHugger Robot
87cbf72d91 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours am: 0abbff1a86 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: Id720143da3b485fd9a01bdaaa6a31064029ad70b
2022-01-13 21:50:48 +00:00
TreeHugger Robot
8a91ea7add [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: If02ad441dd23232075e4fbe9b1927e795aed175e
2022-01-13 21:43:35 +00:00
TreeHugger Robot
0abbff1a86 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I3a13d6cf9644292e474c5554e6423072aca2fb67
2022-01-13 21:37:42 +00:00
TreeHugger Robot
616aecf1ec [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: Iacff1f7f942431bba6f09a9f500a8e60ea394824
2022-01-13 21:25:16 +00:00
TreeHugger Robot
97729a9e16 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I0c4662c0cda74c28d2385ade52a345e84086bbc9
2022-01-13 21:06:55 +00:00
TreeHugger Robot
02a19ec59d [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I34d7fec987c297fbb846888d9cf187d0a0f7321c
2022-01-13 21:06:50 +00:00
TreeHugger Robot
887a7b5c43 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: Ia6e5b90c5642742dd540e9a2d15efa51dfffa174
2022-01-13 20:50:16 +00:00
TreeHugger Robot
3f6a48a552 Merge "Add caller check to com.android.credentials.RESET" into rvc-dev 2022-01-13 20:43:35 +00:00
TreeHugger Robot
9f4837e276 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I858b821fe9d17c4c46d61cb0dc57025b454cbc7e
2022-01-13 20:32:00 +00:00
TreeHugger Robot
76fba21fa8 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours am: 3e06e0c112 -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I6cce0aeefff778c09b3b8b531299cbb82e9bb5d9
2022-01-13 20:20:43 +00:00
TreeHugger Robot
45bfdf58b9 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: Idb425f3dff3259ba3e121a5cbad0cf1cc4feb36b
2022-01-13 20:20:35 +00:00
TreeHugger Robot
b04e0ab405 Merge "Add caller check to com.android.credentials.RESET" into sc-dev 2022-01-13 20:19:00 +00:00
TreeHugger Robot
3e06e0c112 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I19a4cf6f214fa4d6766486a6fea2b82cf7bbc6a2
2022-01-13 20:01:01 +00:00
TreeHugger Robot
3a4ebbfcec Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I16e704faf7e99596482855c90816b1c3bcf6ca69
2022-01-13 20:00:55 +00:00
TreeHugger Robot
01739e127c [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: Iff74bcb5c45d9bd9e2a7766fb00c38d289150d1e
2022-01-13 19:48:23 +00:00
TreeHugger Robot
ea3d0361c8 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I490a23c20a60933dff04251cdf8ba4f24c361e97
2022-01-13 19:47:30 +00:00
TreeHugger Robot
67f53e247a Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I6593507b33223cf79fbf0e134651b78b93464a01
2022-01-13 19:35:55 +00:00
TreeHugger Robot
d902f8c7d6 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I7080ca5b236b6dd34cfe66789ef1a141d3b735cb
2022-01-13 19:35:50 +00:00