Bill Yi
1de90287e1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7e52a4acd3f0f22fdc54abc909035f70d82173e9
2023-03-14 19:03:27 -07:00
Grace Cheng
a796202f11
Update locked device icon in FingerprintEnrollIntroduction
...
Changes locked device icon in FingerprintEnrollIntroduction to be form
factor agnostic
Test: (manual) navigate to FingerprintEnrollIntroduction and observe new
asset
Fixes: 268588691
Change-Id: I747a52319671c7b0f337f0a1c39a529da65b3f43
2023-03-15 01:07:26 +00:00
Xin Li
7e131d0b94
[automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e
-s ours am: dc399ade52
-s ours
...
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: Idf60779f799c604ace73767b0483a609e861b9e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 23:08:02 +00:00
Xin Li
8d7a6eb577
[automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c
-s ours am: d19379e607
-s ours
...
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: I4932292d3c8047b7eddac3c878e5f237ba510a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 23:06:01 +00:00
Xin Li
dc399ade52
[automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e
-s ours
...
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: I35578d54aa72f7abf031eba8873a14e4ccf9a54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 22:35:18 +00:00
Xin Li
d19379e607
[automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c
-s ours
...
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: Ideb892316ec21740723c3d5f06a1b3904f34c3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 22:32:04 +00:00
Lucas Silva
5671ddb191
Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019
Change-Id: I4ba691553814eeb5b2b73f3b9665829db905de10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 21:54:01 +00:00
Lucas Silva
148f1592ef
Merge "Add home controls button to screensaver settings" into tm-qpr-dev
2023-03-14 21:47:03 +00:00
Xin Li
19ca5d6a6e
Merge "Merge Android 13 QPR2"
2023-03-14 21:40:40 +00:00
Behnam Heydarshahi
afb4dd1ece
Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206
Change-Id: I60aab9b333efc5d38f0cbc6f3635948bf734091f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 19:43:25 +00:00
Behnam Heydarshahi
17701cd976
Merge "Extend settings panel under navigation bar" into tm-qpr-dev
2023-03-14 18:54:48 +00:00
Andreas Miko
51cb60cc7c
Add setting to disable PIN animation and password am: 30bf66db42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21369281
Change-Id: I39f9675c5b3fc234608882780a62141061bf1e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 18:05:35 +00:00
Julia Reynolds
a9ccc96efd
Don't show NLSes with excessively long component names
...
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-14 14:48:29 +00:00
Xin Li
d15a2d7e0c
Merge Android 13 QPR2
...
Bug: 273316506
Merged-In: I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0
Change-Id: I31663f525e4d6739bf511d0a47cfe69d22feeccb
2023-03-13 23:11:28 -07:00
Andreas Miko
30bf66db42
Add setting to disable PIN animation and password
...
Test: Unit - atest SettingsRoboTests
Test: Manual - Set PIN lock and enabled/disabled the setting to observe animation change during PIN entry
Bug: b/204799468
Merged-In: I587b993ef5515a075442e82ebafae88bebdffc20
Change-Id: I587b993ef5515a075442e82ebafae88bebdffc20
2023-03-14 02:27:51 +00:00
Paul Wang
d4fbc38279
Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3
am: d60b851b93
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124
Change-Id: I2ba651e080ca1f054ff03d3d125848031ced4e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 10:58:14 +00:00
Paul Wang
d60b851b93
Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124
Change-Id: I231847656a260eff43204306faf8c3908c9fc8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 10:22:11 +00:00
Paul Wang
dd3d813ff3
Merge "Avoid disabling LE Audio when BT is off"
2023-03-13 09:55:49 +00:00
Candice Lo
934beb4127
Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21791725
Change-Id: I0b61473ac3ef0a91e2ed901d7b2deb1e35268866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 07:22:21 +00:00
Candice Lo
91eab671d1
Merge "Set the settings key when the font size is changed" into tm-qpr-dev
2023-03-13 06:51:27 +00:00
Diya Bera
9a93c8a00f
Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480
Change-Id: Iddfaa9baa18e16d3b1f5e06de88d74faf208c811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 23:26:58 +00:00
Diya Bera
9777ea2fdf
Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev
2023-03-10 21:11:09 +00:00
Behnam Heydarshahi
806297f85c
Extend settings panel under navigation bar
...
The panel used to sit above the navigation bar. Now it extends down all
the way to the edge of the screen.
Bug: b/250484565
Test: make ROBOTEST_FILTER=SettingsPanelActivityTest RunSettingsRoboTests -j40
Test: Manual. When volume panel is opened, verify that it extends all
the way to the bottom of the window, instead of sitting on navigation
bar. Panel can be opened with:
adb shell am start -a android.settings.panel.action.VOLUME
Substitute VOLUME with NFC and WIFI for the other settings panels.
Change-Id: Ibae5d3602231e2309b5ff847c630a1f8c82ea355
2023-03-10 18:30:08 +00:00
Treehugger Robot
3c62dd3543
Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59
am: c8a58a249d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443
Change-Id: I8ec06e45f02f48bfec30051159ed8a931a11e2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 16:27:37 +00:00
Treehugger Robot
c8a58a249d
Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443
Change-Id: I76493ccb15ff2d58045061ef4c62b20f772aab30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 15:53:41 +00:00
Treehugger Robot
821e70ea59
Merge "Adb is disconnecting during Monkey Test Run."
2023-03-10 15:19:15 +00:00
Junyu Lai
4beef2e82e
Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74
am: 0da4abe1db
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336
Change-Id: Ia79b5f286b4269c38fc3a2fa990615251694a020
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 10:12:13 +00:00
Junyu Lai
0da4abe1db
Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336
Change-Id: I3e55fc5496918d8e2d0c230df74b62e1e6847fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 09:37:20 +00:00
Junyu Lai
ae267bae74
Merge "Do not crash when duplication found in merged imsi list"
2023-03-10 09:01:44 +00:00
Lucas Silva
4ace76e6c2
Add home controls button to screensaver settings
...
Toggle will allow users to disable showing home controls over their
screensaver.
Bug: 271330583
Test: make -j64 RunSettingsRoboTests
Change-Id: I9600cdb85d85253c859c88f12c1d074e1082bf97
2023-03-09 14:58:26 -05:00
Junyu Lai
8005bc8f5b
Do not crash when duplication found in merged imsi list
...
For some unknown reason, the merged imsi list might contain
duplicated items. Deduplication for better error handling.
Test: make RunSettingsRoboTests
Fix: 271298466
Change-Id: I3cbe8f9441769963a16720fc5128db173fa0868b
2023-03-09 16:55:35 +08:00
Diya Bera
8ceded494f
Remove subtext when enrollment stage changes
...
Bug: 272145668
Test: Manual (Try enrolling fingerprint in UDFPS, the subtext should
disappear when lottie asset is introduced)
Change-Id: I912ff2b32644d05cc189105ae1679fa14b04a1ef
2023-03-08 23:00:47 +00:00
Yu-Ting Tseng
11ab38f690
Merge "Remove CACHED_PROC_STATES which is unused." into tm-qpr-dev am: f7a098295f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21779083
Change-Id: I995d75f9a0cf98b329f0de672a7677307a434695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-08 22:17:51 +00:00
Yu-Ting Tseng
f7a098295f
Merge "Remove CACHED_PROC_STATES which is unused." into tm-qpr-dev
2023-03-08 21:24:57 +00:00
Maciej Żenczykowski
7e21dec65e
Merge "settings: allow enabling ethernet tethering independent of link state" am: 905d584b15
am: f73112b56e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2475089
Change-Id: I68e8a5898af8426250e1f0eb2d187e977f82dd13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-08 04:15:54 +00:00
Maciej Żenczykowski
f73112b56e
Merge "settings: allow enabling ethernet tethering independent of link state" am: 905d584b15
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2475089
Change-Id: I3976958e427d18b9b5c3d6ce59cb45969145fa23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-08 03:41:54 +00:00
Maciej Żenczykowski
905d584b15
Merge "settings: allow enabling ethernet tethering independent of link state"
2023-03-08 03:05:53 +00:00
Patrick Rohr
6f9062297f
settings: allow enabling ethernet tethering independent of link state
...
A user should be able to enable tethering even if the interface does not
have link yet. Therefore, the toggle should be active if any interface
is available, independent of its link state.
Test: TH
Bug: 234036868
Change-Id: I2ae25207a766d71217dd6d17f3f9b74ceb261238
2023-03-08 00:57:03 +00:00
Dmitry Dementyev
c7e8052b52
Convert argument to intent in AddAccountSettings.
...
Bug: 265798353
Test: manual
Change-Id: I0051e5d5fc9fd3691504cb5fbb959f701e0bce6a
2023-03-07 10:36:41 -08:00
Candice Lo
f19f710b01
Set the settings key when the font size is changed
...
The key ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED will be always ON
after users modify the font size for the first time.
Bug: 269679768
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FontSizeDataTest
Change-Id: I5967227ce05d5b8bf37dfec9aafa015c5cacbd30
Merged-In: I382e4ecd3c335d7b046f157cedc093fc40c3a77a
2023-03-07 15:56:58 +00:00
Paul Wang
f1007faeba
Avoid disabling LE Audio when BT is off
...
The `updateState` function gets called when the Developer Options menua
is rendered (opened). Originally when BT is off at this point, LE Audio
is disabled, and the user needs to reboot the device again to enable LE
Audio. This CL fixes this and marks the option as disabled when BT is
off.
Bug: 263684630
Test: Manual
Change-Id: I243e2c57fc12bfefd4ab83f63336fb41639f05a0
2023-03-07 13:30:37 +00:00
Julia Reynolds
0cb9c59631
Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb
am: 56e2a08f3f
am: 769dc23f37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803
Change-Id: Ie62d086193232e8a13e44c922f332ce1d9541ddc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 01:53:22 +00:00
Valentin Iftime
1dd5830b05
[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7
am: fe2ad5085f
am: b25fcaab93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803
Change-Id: I95599c7885cfe417a60db4b18044dec3019bd9c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 01:53:13 +00:00
Julia Reynolds
769dc23f37
Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb
am: 56e2a08f3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803
Change-Id: I51889453230cabae593a2b1f712f721f218543ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 01:18:37 +00:00
Valentin Iftime
b25fcaab93
[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7
am: fe2ad5085f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803
Change-Id: If68221c5187809f18c0d0d3e9775d351017f2f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 01:18:33 +00:00
Julia Reynolds
56e2a08f3f
Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803
Change-Id: Ie7171fe36f6fda62ce827c41b18e8c625c94359b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 00:43:17 +00:00
Valentin Iftime
fe2ad5085f
[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803
Change-Id: I4942c2bb54de7d06d147d1a592ae25ac5184ab9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 00:43:14 +00:00
Julia Reynolds
65a6e18fcb
Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev
2023-03-07 00:03:01 +00:00
Iavor-Valentin Iftime
67fb12cbfd
[automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4
am: e116e63a91
-s ours am: 91ade78763
-s ours am: 89c9dc07df
-s ours am: 7a997113d1
-s ours am: 5cd3dc7d1d
-s ours am: 66b0c4e41b
-s ours am: fa8d8ba74c
-s ours
...
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639
Change-Id: Ib0c69f26935ada1c1b7415da093a52a734034fe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 22:15:23 +00:00
Iavor-Valentin Iftime
fa8d8ba74c
[automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4
am: e116e63a91
-s ours am: 91ade78763
-s ours am: 89c9dc07df
-s ours am: 7a997113d1
-s ours am: 5cd3dc7d1d
-s ours am: 66b0c4e41b
-s ours
...
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639
Change-Id: I2805607dbdb185abf234d3002bc6cf3eeda917e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 21:41:36 +00:00