Bill Yi
|
1038149e58
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a4e68d269 am: eea2a19c9a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425014
Change-Id: I6640dd3995bd9fbf90dcde87f65f8d21ec6332af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-04 05:01:52 +00:00 |
|
Bill Yi
|
bdf1c0d0ff
|
[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: I2e0c56cb75cfe4d8eda03fd36ebddd641ebe193b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 21:55:39 +00:00 |
|
Hao Dong
|
0703f48ea6
|
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: Ic19fe7709084759ae0637b6a1981a05e7dd97541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 21:55:20 +00:00 |
|
Hao Dong
|
8aae584706
|
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: Ib890de88266fea8aeee3b17038b2f55979799cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 21:53:07 +00:00 |
|
Bill Yi
|
d91a9e506a
|
[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: I54e56f9a7c86dde12ee71b7a89076927fdc60734
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 21:28:24 +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
|
e63893afe7
|
[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: I03fe90cde312eb69915aa8b08b4a25924220d836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 21:01:07 +00:00 |
|
Bill Yi
|
66ce27e9b1
|
[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: I08d84eb6884581d359beff119b4d3f574805ebe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 21:01:06 +00:00 |
|
Bill Yi
|
d32bfe69d6
|
[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: Ibaffaac082919ddb7e00a3ba05ef0bb69cc9bfcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 21:01:04 +00:00 |
|
Bill Yi
|
ebe838839b
|
[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: I88683fa7841083cfdfe8a711d88c29264b8e5edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-03 20:59:37 +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
|
eea2a19c9a
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a4e68d269
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425014
Change-Id: I9a8f41aeff3f2d7585d46e1618449b06eec732ff
|
2023-04-03 14:35:51 +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
|
7a4e68d269
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ieb9881a34662fb6c68038a3702b7e26907e25ef0
|
2023-04-02 17:45:04 -07: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
|
c725f550c0
|
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: Ic26e8a1c56b28b6c87b6678c558fe3179452982d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-02 06:31:08 +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
|
11606c8bc1
|
[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: Id717ef054d57424bddb85d3c7e0d02e647f34c20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-01 08:36:42 +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 |
|
Bonian Chen
|
e8b96d4b25
|
[Settings] Avoid from user without sufficient permission to change WiFi am: 61e6c46fa7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21373178
Change-Id: I2f29593b98a41fe4ced1f72dd9523be341850c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-04-01 07:32:05 +00:00 |
|
Bill Yi
|
a2f4c8bd49
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie5e4ab0bbea59e5f05353776da8d5ae625767d93
|
2023-03-31 17:03:07 -07:00 |
|
Bill Yi
|
5847bd476f
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9609f118fd4a653fd4a5a62fe786691d489e1d83
|
2023-03-31 16:56:15 -07:00 |
|
Candice Lo
|
e0c519f15b
|
Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev am: 470dbd6884
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347809
Change-Id: I3891bbc45413262524bd20b34d2483db88d5327a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 23:41:35 +00:00 |
|
Candice Lo
|
470dbd6884
|
Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev
|
2023-03-31 23:17:48 +00:00 |
|
Chris Antol
|
d067d026d8
|
Merge "Enable hover states for SeekBarPreference" into udc-dev am: ca08af3ff6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361715
Change-Id: Id0b4935323d5f961a2613207cf1bb92793da8b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 21:28:00 +00:00 |
|
Chris Antol
|
ca08af3ff6
|
Merge "Enable hover states for SeekBarPreference" into udc-dev
|
2023-03-31 20:57:16 +00:00 |
|
Bill Yi
|
9964fcc418
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: cadf15af82 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324317
Change-Id: I5a12496f95fa265fad1e0735e4331e4d2f9d25d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 20:21:09 +00:00 |
|
Bill Yi
|
2ef9315b35
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31c51eb0d6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324317
Change-Id: I6b06ed3a12c1f8e448e3a4704a8c375d438f7d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 20:21:05 +00:00 |
|
Bill Yi
|
c3402313e6
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 126b81097a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324315
Change-Id: I35dc6fa7937a7fcf7c7a3e8caaaedc8fbfe4b203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 20:20:59 +00:00 |
|
Bill Yi
|
68121e313a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55e5d7a9c7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324315
Change-Id: I797d40d10437323ae8f304c08631314a4eae4dd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 20:20:35 +00:00 |
|
Bill Yi
|
ce26a7c63a
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3a355835db -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324313
Change-Id: I676a6a9043f64bf6a21682fd4987bdb4e3be0cc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 20:20:07 +00:00 |
|
Bill Yi
|
b434cc34ef
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea4029233f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324313
Change-Id: Id2ed19ab792a3ae9b17cb75798064e76d3dca2ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 20:19:43 +00:00 |
|
Hao Dong
|
322df0454f
|
Show Class 3 consent screen in enrollment with strong face.
Test: atest FaceEnrollIntroductionTest
Bug: 271903097
Change-Id: I1959a82862790ff918571145b3651d164aa118b6
|
2023-03-31 20:11:44 +00:00 |
|
Bill Yi
|
cadf15af82
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
|
2023-03-31 19:51:51 +00:00 |
|
Bill Yi
|
126b81097a
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
|
2023-03-31 19:51:51 +00:00 |
|
Bill Yi
|
3a355835db
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
|
2023-03-31 19:51:51 +00:00 |
|