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
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
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
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
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
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
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
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
c96e19f819
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: I76dfd28a5bbed12adde56a94564ebfb440ff804b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:42:34 +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
Bill Yi
e9faa25ab9
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-03-31 22:19:18 +00:00
Bill Yi
abec88bf3d
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-03-31 22:19:18 +00:00
Bill Yi
9ccc6527a5
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-03-31 22:19:18 +00:00
Chris Antol
4b37ad1a3d
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: I99c742e3c75dc04afe3024ab57188a13213e436f
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
85d005509a
[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: I2f5d2fe9aaf05fc3c84d839e69be905710188306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:34:20 +00:00
Bill Yi
193005bd26
[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: I515957d595c68d67db5012855e1f8efc42943c7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:34:18 +00:00
Bill Yi
2943bc5df8
[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: I0976563fce956aebefc8e1d5a8fb86ab0d3c48ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:34:17 +00:00
Bill Yi
0591345d4b
[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: I0749e6087f708b446854ef7295ffee0568589aa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:34:11 +00:00
Bill Yi
14a1ecbf35
[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: I2f41f512cc8326ca16a7912c20e676790ad9b507
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:34:10 +00:00
Bill Yi
ee1f78854e
[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: I31c86cd50bc0d62fb63b92cfab587a2ad8b17ca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:26:42 +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
TreeHugger Robot
7f278b5527
Merge "Moves lock screen shortcuts summary loading to the background." into udc-dev am: 8ae1abecc1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22260969
Change-Id: I57df2e5887e41f1cb09bf78914f1289488540adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 18:52:45 +00:00
TreeHugger Robot
8ae1abecc1
Merge "Moves lock screen shortcuts summary loading to the background." into udc-dev
2023-03-31 18:48:29 +00:00
Jan Tomljanovic
f2c811c455
Merge "Change page title of More security & privacy settings" into udc-dev am: d082c0aa4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22372069
Change-Id: I5f5cce5dacbc9fa7521b780c3cc79c22c9b3c9fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 18:42:54 +00:00
Candice Lo
d2c53a2085
Announce scaled value for font scaling seekbar in Talkback
...
1. Keeping state descriptions for the seekbar as an array in the
PreviewSizeSeekBarController when we would like to customize the
state description.
2. Setting the scaled value to be the state description for the font
scaling seekbar when there is a progress change to the seekbar.
Bug: 269212483
Test: manually - attach videos to the bug
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PreviewSizeSeekBarControllerTest
Change-Id: I8e9e3681a0174f454cac871ebf62d785962c7165
2023-03-31 17:38:14 +00:00
Jan Tomljanovic
d082c0aa4c
Merge "Change page title of More security & privacy settings" into udc-dev
2023-03-31 16:25:47 +00:00
Yuri Ufimtsev
61b8f70841
Merge "Change Biometric preferences summary when not enrolled" into udc-dev am: df9c660ed6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22372068
Change-Id: I151e16dfaf7b1e60969f9a0b8bcb6e25d1e8f3b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 14:40:40 +00:00
SongFerng Wang
b61e930c61
Merge "UI add more log" into udc-dev am: 378c2cf87b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22371396
Change-Id: I843e75f3dbe4c3f1a5a41907e02ca06a65c52f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 14:38:37 +00:00