TreeHugger Robot
|
a8f718b412
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 86e8a12fb3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425003
Change-Id: Iae9df9ba358e4615c9c9dd3307b1d695ab25ab2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 23:56:20 +00:00 |
|
Bill Yi
|
182018c6b1
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34efab58d3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425003
Change-Id: Iec2bc8d686995f34bd3f06bf004a0cd549cf3a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 23:55:50 +00:00 |
|
TreeHugger Robot
|
86e8a12fb3
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
|
2023-04-03 23:14:11 +00:00 |
|
TreeHugger Robot
|
6fb1f18478
|
Merge "Import translations. DO NOT MERGE ANYWHERE"
|
2023-04-03 23:03:11 +00:00 |
|
TreeHugger Robot
|
9a20fccb6c
|
Merge "Import translations. DO NOT MERGE ANYWHERE"
|
2023-04-03 23:03:11 +00:00 |
|
TreeHugger Robot
|
13ba90011a
|
Merge "Import translations. DO NOT MERGE ANYWHERE"
|
2023-04-03 23:03:11 +00:00 |
|
Bill Yi
|
5038a47c89
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3 -s ours am: 076cc4fc6c -s ours am: 0fcfd96c98 -s ours am: 3342f42150 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425018
Change-Id: I5503611c1417fd4187aaf068a124e1ea81093553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 22:57:14 +00:00 |
|
Hao Dong
|
2e31d34f69
|
Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev am: 5a2ba07f63 am: 70f4d50b2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361082
Change-Id: Icf2d8ff26f0c6e242271ddd494a69177b9342cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 22:54:47 +00:00 |
|
Hao Dong
|
005f214d54
|
Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev am: 637ae9d983 am: fc1fe263fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22078930
Change-Id: I6a0ac3df96141e23621f5c6d3f814c6f07fafd64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 22:52:33 +00:00 |
|
Bill Yi
|
3342f42150
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3 -s ours am: 076cc4fc6c -s ours am: 0fcfd96c98 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425018
Change-Id: I925f5d7970474efd23de284baa6852c2448097f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 22:01:54 +00:00 |
|
Hao Dong
|
70f4d50b2f
|
Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev am: 5a2ba07f63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361082
Change-Id: Icd3ea8987a10c465c48a353a9baa47316518231b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 22:01:33 +00:00 |
|
Hao Dong
|
fc1fe263fe
|
Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev am: 637ae9d983
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22078930
Change-Id: If31c582f6f4cf02f41d7b100446412237f943772
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 22:01:14 +00:00 |
|
Bill Yi
|
0bb31ed68b
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4c6c727262 am: 7d4a0514cf -s ours am: 8ea1c1ff59 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425015
Change-Id: I7884f3efa5627b3ede5e36f15df5c31ca5742cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 21:34:18 +00:00 |
|
Bill Yi
|
0fcfd96c98
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3 -s ours am: 076cc4fc6c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425018
Change-Id: I1926d30af3c09df9c8393eea049c7a2a675a8e41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 21:27:53 +00:00 |
|
Hao Dong
|
5a2ba07f63
|
Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev
|
2023-04-03 21:14:37 +00:00 |
|
Hao Dong
|
637ae9d983
|
Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev
|
2023-04-03 21:06:40 +00:00 |
|
Bill Yi
|
8ea1c1ff59
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4c6c727262 am: 7d4a0514cf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425015
Change-Id: I46acaf77116925dbb4e91aada4187ba3e362a742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 21:02:03 +00:00 |
|
Bill Yi
|
076cc4fc6c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425018
Change-Id: I035cb268a83cfbdae6eca6c1c4b3f43306b5dc2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 20:58:59 +00:00 |
|
Hao Dong
|
ee8252b56b
|
Show a dialog preventing fingerprint enrollment in split mode.
Test: atest CombinedBiometricProfileSettingsTest
Test: atest FingerprintSettingsFragmentTest
Test: manaul test- go to split screen mode and try to enroll
fingerprint
Bug: 246247132
Change-Id: I12357d197f2ceda8c1f1f582cdecb20fd18e30f7
|
2023-04-03 18:02:22 +00:00 |
|
Bill Yi
|
7d4a0514cf
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4c6c727262
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425015
Change-Id: I11461a7dba648fbdd5a952aa6b1d2a2809058bc2
|
2023-04-03 14:35:31 +00:00 |
|
Bill Yi
|
179fdda8d3
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9687e3f6e8e0adb69d87cedd36926f91f0fd732c
|
2023-04-02 17:52:31 -07:00 |
|
Bill Yi
|
4c6c727262
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie6806ae2768788dbef4a8dcff5f418970731ebb6
|
2023-04-02 17:46:34 -07:00 |
|
Bill Yi
|
09dbb8cd49
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie4a6144a2775a690633f7cf183c71dce9eeb3365
|
2023-04-02 16:51:26 -07:00 |
|
Bill Yi
|
a125674f12
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I59062c543b7827661bd474ade118447546de979b
|
2023-04-02 16:39:56 -07:00 |
|
Bill Yi
|
34efab58d3
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7bab6057f3a9ac9fba376e7731891a100aa97632
|
2023-04-02 16:37:48 -07:00 |
|
Bill Yi
|
1b72d776ed
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia76899f07cd7e4948adfc7d799e7bbacaf4c9310
|
2023-04-02 16:36:25 -07:00 |
|
Bill Yi
|
16d455e59a
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910 -s ours am: c7918b9ac3 -s ours am: 506a9b317d -s ours am: 4040f0dc33 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: Ifb8f47fd241fe95087f31578eb271b54922965b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 19:49:13 +00:00 |
|
Bill Yi
|
1b53838ef8
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49 -s ours am: 2309f00455 -s ours am: 7555bb81d1 -s ours am: 4038fae85a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: I250c2cbef87df0118dfd8b6486a52e4a08ba059c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 19:49:05 +00:00 |
|
Bill Yi
|
5a2f468f71
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours am: 2a19621591 -s ours am: 3c525dc4e3 -s ours am: 2379404b47 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: Ia09e446981b707303d8897abecb2a3926956cd11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 19:48:46 +00:00 |
|
Bill Yi
|
d59fea6fca
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours am: 107129903a -s ours am: bdd7345e26 -s ours am: 25207a98ff -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: I97b7dab6c18e87c76de01770e4d2e8a655d0d502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 19:48:23 +00:00 |
|
Bill Yi
|
4040f0dc33
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910 -s ours am: c7918b9ac3 -s ours am: 506a9b317d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: Ibc29247ba16c40f178f62e859ff05b259519fcf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 19:21:39 +00:00 |
|
Bill Yi
|
4038fae85a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49 -s ours am: 2309f00455 -s ours am: 7555bb81d1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: I1b3b83e996d0298c1bf7c0d800ce04b9f2484b23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 19:21:30 +00:00 |
|
Bill Yi
|
2379404b47
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours am: 2a19621591 -s ours am: 3c525dc4e3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: Iea2e6091924d2422ec9a9144142041799c47a12b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 19:21:12 +00:00 |
|
Bill Yi
|
25207a98ff
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours am: 107129903a -s ours am: bdd7345e26 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: I6a621fb6a3a000bcf34229f6abc7808bee61fc07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 19:20:51 +00:00 |
|
Bill Yi
|
506a9b317d
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910 -s ours am: c7918b9ac3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: I7357483d255938670c6ff10ebd22f72f76e6bf0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 19:18:32 +00:00 |
|
Bill Yi
|
7555bb81d1
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49 -s ours am: 2309f00455 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: I39e92ab880ff65c6c2893df671cbc48fcec92028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 19:18:24 +00:00 |
|
Bill Yi
|
3c525dc4e3
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours am: 2a19621591 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: Ib4af7b662cd2a8e5087376cbbd619efaf951ca75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 19:18:08 +00:00 |
|
Bill Yi
|
bdd7345e26
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours am: 107129903a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: I55532e33ae7ecf812d8cc54acbe9dbd3d94f40d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 19:17:41 +00:00 |
|
Bill Yi
|
c7918b9ac3
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: I0c078e0ceafb27e2c05505aa140a34909dea7f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 18:46:13 +00:00 |
|
Bill Yi
|
2309f00455
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776
Change-Id: I0b507ab323bccf47d2b145c5842a18809e312215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 18:46:03 +00:00 |
|
Bill Yi
|
2a19621591
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: I7c878063b45fbbc1003be421c27c6b809db10051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 18:45:48 +00:00 |
|
Bill Yi
|
107129903a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393771
Change-Id: Ica28fa658d4b2992a86850c9d126585cd18c9f0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 18:45:21 +00:00 |
|
Bill Yi
|
a3af1db910
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
|
2023-04-02 18:22:50 +00:00 |
|
Bill Yi
|
f884a037be
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
|
2023-04-02 18:22:50 +00:00 |
|
Angela Wang
|
25776de690
|
Merge "Improves Settings search result of Flash Notifications" into udc-dev am: 4fb7c76213 am: 3e304f9e1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323070
Change-Id: Ie16d8f856509b5290ef6254074ded0126f947bb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 07:01:28 +00:00 |
|
Angela Wang
|
3e304f9e1f
|
Merge "Improves Settings search result of Flash Notifications" into udc-dev am: 4fb7c76213
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323070
Change-Id: I4ffcbfb99d718f96be27e93bcf6eb49ea4ebe7c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 06:31:19 +00:00 |
|
Angela Wang
|
4fb7c76213
|
Merge "Improves Settings search result of Flash Notifications" into udc-dev
|
2023-04-02 05:59:32 +00:00 |
|
Bonian Chen
|
64ff4fa85d
|
[automerger skipped] [Settings] Avoid from user without sufficient permission to change WiFi am: 61e6c46fa7 am: e8b96d4b25 -s ours am: 432886441f -s ours am: fa3e0fcded -s ours
am skip reason: Merged-In I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a with SHA-1 a1d3fe061e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21373178
Change-Id: Ied5ef2ad1263a6308d1f00eb52bc33e4ceb9e69a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-01 09:03:41 +00:00 |
|
Bonian Chen
|
fa3e0fcded
|
[automerger skipped] [Settings] Avoid from user without sufficient permission to change WiFi am: 61e6c46fa7 am: e8b96d4b25 -s ours am: 432886441f -s ours
am skip reason: Merged-In I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a with SHA-1 a1d3fe061e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21373178
Change-Id: I909590559f738ababa21d3d9fb9783c402fa46a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-01 08:36:54 +00:00 |
|
Bonian Chen
|
432886441f
|
[automerger skipped] [Settings] Avoid from user without sufficient permission to change WiFi am: 61e6c46fa7 am: e8b96d4b25 -s ours
am skip reason: Merged-In I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a with SHA-1 a1d3fe061e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21373178
Change-Id: I9668251485a221e6ae646dd403db27ed45d7740e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-01 08:02:26 +00:00 |
|