Bill Yi
9c34ce478f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9ccc6527a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22330445
Change-Id: I8a5e47ad583936b535570d06a57fd44e1a6aa500
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:26:26 +00:00
Bill Yi
8a31056b4b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c09addb7ed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22330445
Change-Id: I86e5150eb74a1b08f537e61a23cc613a4152a34e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:24:09 +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
436a5dbe01
Merge "Enable hover states for SeekBarPreference" into udc-dev am: ca08af3ff6
am: 4b37ad1a3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361715
Change-Id: I03f6dba51f168cc0a19e48c8770aceb6ecaf6212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:09:47 +00:00
Bill Yi
4e707d0a0f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: cadf15af82
-s ours am: 85d005509a
-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: I7900f3b25bc69b49d91a8e24ff2e88d9c870644b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:01:05 +00:00
Bill Yi
c78aa15829
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31c51eb0d6
-s ours am: 193005bd26
-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: Ie880afcf178dfb3015c23e1adf847fdbd8a42bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:00:59 +00:00
Bill Yi
54015dec0c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 126b81097a
-s ours am: 2943bc5df8
-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: Iea82b0f6835290ecf0d1ba2c5948c5bae5d664ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:00:50 +00:00
Bill Yi
5cd00caaf6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55e5d7a9c7
-s ours am: 0591345d4b
-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: I6c81e0c57d96eda4604917ff429abdc0b6a578b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:00:38 +00:00
Bill Yi
dd1f280faf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3a355835db
-s ours am: 14a1ecbf35
-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: Ia1b16620f4bcf906264e823426498ebaf74b0033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:00:18 +00:00
Bill Yi
3d26d430ef
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea4029233f
-s ours am: ee1f78854e
-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: I8b83eedd7c8a27e34890e4547f7bcc6ff1cc656d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 22:59:47 +00:00
TreeHugger Robot
8248c8506f
Merge "Moves lock screen shortcuts summary loading to the background." into udc-dev am: 8ae1abecc1
am: 7f278b5527
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22260969
Change-Id: I15550a1d82e80e11c313711851951c94329c25aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 22:56:42 +00:00
Jan Tomljanovic
1dfad1416d
Merge "Change page title of More security & privacy settings" into udc-dev am: d082c0aa4c
am: f2c811c455
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22372069
Change-Id: I6e402f01554218a60ee3d4448748c6a169c90d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 22:53:34 +00:00
Yuri Ufimtsev
49863f246c
Merge "Change Biometric preferences summary when not enrolled" into udc-dev am: df9c660ed6
am: 61b8f70841
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22372068
Change-Id: I4573f9d25f9d61e1d8d6a43e038f4874ae526f68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 22:50:23 +00:00
SongFerng Wang
6e7d0bda86
Merge "UI add more log" into udc-dev am: 378c2cf87b
am: b61e930c61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22371396
Change-Id: I7a0434a1b71160b7b9dbe57d1769801caae8405a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 22:46:23 +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
Darrell Shi
a86614db74
Hide timeout to user0 pref when switching blocked.
...
Do not show the "timeout to admin user" settings preference when user
switching is blocked on the current user, e.g. in demo mode.
Test: atest SettingsRoboTests:TimeoutToDockUserPreferenceControllerTest
Bug: 255277938
Change-Id: Ibd0944c69254000a453f477eb72a0ba5832e9793
2023-03-31 22:14:35 +00:00
Marcelo Arteiro
cf9332fd49
Merge "Automated Token Alignment Android/Material" into udc-dev am: 0102eb84ec
am: a8525d4212
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21989405
Change-Id: Iae62ee4328d26922d1bedd2475c49aba2b45d0bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 21:54:18 +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
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
Bill Yi
dff27ef445
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-03-31 20:21:51 +00:00
Bill Yi
31190224ad
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-03-31 20:21:51 +00:00
Bill Yi
3917886974
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-03-31 20:21:51 +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
TreeHugger Robot
0afc876fdc
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: Ic39dda7a04084a312ad530b8f34190b6059355ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 19:51:13 +00:00
Aurélien Pomini
649c5082c6
Add contrast setting in dev options
...
See the attached video from b/266071578#comment2 to see how the setting
looks like.
Bug: 266071578
Test: atest ContrastDialogTest
Test: atest ContrastDialogControllerTest
Change-Id: Id9fc31a0562059814d4e342ea8095adc5b53d5f3
2023-03-31 19:35:08 +00:00
Jan Tomljanovic
025333e827
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: Ia6e8232d6885e99a10264aca45bb27291bdc0162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 19:17:12 +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
5e46e6bf92
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: Idc0d2c3d191a570caaa263205f24b1290c0bb31b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 14:40:45 +00:00