Commit Graph

125966 Commits

Author SHA1 Message Date
Tom Hsu
f84799f0a2 Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4 am: f0fa79dc18 am: a754427874
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462

Change-Id: Ie00ced931b6845fae4f9521a1601e28e7f253abd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 04:12:13 +00:00
Tom Hsu
4ca5feddd3 Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4 am: 86db37ddcc am: 8cd034ae72
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462

Change-Id: Icd322832eb6a0b341f2983f13b23e309daf48930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 04:11:36 +00:00
Tom Hsu
a754427874 Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4 am: f0fa79dc18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462

Change-Id: Ic09ee4ea3bf4b9ab6dfde001bf0393b4c0ef16b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 03:30:18 +00:00
Tom Hsu
233665d47c Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4 am: 86db37ddcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462

Change-Id: I2a71646abcb9264fec4820230718a18f20243efe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 03:29:03 +00:00
Tom Hsu
8cd034ae72 Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4 am: 86db37ddcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462

Change-Id: Ic7d3565555f54a259a647f614370381c9563d3e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 03:25:33 +00:00
Tom Hsu
86db37ddcc Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462

Change-Id: Id715f0645548dc225cfcc1a3396e0e81bd06fbdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 02:46:16 +00:00
Tom Hsu
f0fa79dc18 Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462

Change-Id: Ie10308abc3b2ba08bfc5801ced15dc7132466d9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 02:41:59 +00:00
Tom Hsu
69caf6fbe4 Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev 2023-05-26 02:08:13 +00:00
Hao Dong
2eadf68438 Fix Fingerprint enrollment UI when display size is largest.
1. Remove land/udfps_enroll_enrolling and use the default land layout
instead. Swap header and content when necessary to avoid overlap.
2. Add UdfpsEnrollEnrollingView.java

Test: manual test - 1. Set system display and font size largest
	            2. Launch fingerprint enrollment and check UI.
Test: atest FingerprintEnrollEnrollingTest
Bug: 269060514
Bug: 283169056
Change-Id: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
2023-05-25 21:54:07 +00:00
Yuxin Hu
281ac47c33 Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb am: f783947615 am: d8fbd089d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: I03241ab23527c86e69469f7fd9e9796fd924b4d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 20:39:02 +00:00
Yuxin Hu
5db4f3fa9b Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb am: 75b784fcd0 am: fe2ed9c453
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: I103e16e48099405020ce636fe35097f1dc100e46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 20:38:17 +00:00
Viesturs Zarins
04e1cc304d Merge "Fix missing Activity embedding allowlisting for Assistant. The normal settings fragments are already allowlisted via SubSettingActivity. ManageApplications fragment based activities are not compatible with that however." into udc-d1-dev am: 8e9955a4f3 am: cd6409b84c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262238

Change-Id: Ib8ce403f545b51f03edffe10551079ba2db9896d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 20:37:54 +00:00
Yuxin Hu
59af6df619 Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb am: f783947615 am: 1af33f713b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: Ib0f282be3b9f96abeff70eba344e63ab1c6b8c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 20:37:38 +00:00
Viesturs Zarins
c4272f8d7b Merge "Fix missing Activity embedding allowlisting for Assistant. The normal settings fragments are already allowlisted via SubSettingActivity. ManageApplications fragment based activities are not compatible with that however." into udc-d1-dev am: 8e9955a4f3 am: e6a708e0a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262238

Change-Id: I73e641eb833ce94de481e897da06caa75729e570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 20:35:12 +00:00
Yuxin Hu
fe2ed9c453 Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb am: 75b784fcd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: Ib0b2225ea16febddde345c2edc0fef1fd18e4e3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:49:13 +00:00
Yuxin Hu
d8fbd089d8 Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb am: f783947615
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: I7d2cfa1bb297eab9ff0b06ed10d628153ae1c40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:48:28 +00:00
Viesturs Zarins
cd6409b84c Merge "Fix missing Activity embedding allowlisting for Assistant. The normal settings fragments are already allowlisted via SubSettingActivity. ManageApplications fragment based activities are not compatible with that however." into udc-d1-dev am: 8e9955a4f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262238

Change-Id: I2829a6386bc5e9b710e2e4dc62636aa9493a6f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:47:56 +00:00
Yuxin Hu
1af33f713b Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb am: f783947615
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: Ifdca402cee4f367a73952887663685478bcffabb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:46:15 +00:00
Viesturs Zarins
e6a708e0a6 Merge "Fix missing Activity embedding allowlisting for Assistant. The normal settings fragments are already allowlisted via SubSettingActivity. ManageApplications fragment based activities are not compatible with that however." into udc-d1-dev am: 8e9955a4f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262238

Change-Id: I6801b2b87bad63dad61a739025e99dd3425180c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:44:48 +00:00
Yuxin Hu
75b784fcd0 Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: I9f456a0b676c188c61e0ae4002d57a0d7f6c3dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:03:06 +00:00
Yuxin Hu
f783947615 Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: I55082fed74d343f8c1daab93e7fb73d093853d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:02:31 +00:00
Viesturs Zarins
8e9955a4f3 Merge "Fix missing Activity embedding allowlisting for Assistant. The normal settings fragments are already allowlisted via SubSettingActivity. ManageApplications fragment based activities are not compatible with that however." into udc-d1-dev 2023-05-25 18:49:59 +00:00
Yuxin Hu
67c72c01cb Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev 2023-05-25 18:08:10 +00:00
Austin Wang
9df7a5ca8d Add more search terms for WPP
Bug: 275728495
Test: flash and search settings
Change-Id: I59b7b95c7f105cf1577b5649ddb8a0844ab93f01
2023-05-25 11:07:40 -07:00
tom hsu
06c3ae5e82 [Settings] Avoid settings crash from NPE of TelephonyManager.
Bug: 233783567
Test: atest passed
Change-Id: Ie0ed8fa3b87b8e130396cf4d918295403ae43501
2023-05-25 14:37:51 +00:00
Angela Wang
abebbfc4b3 Make Hearing devices preference always visible
Previously we hide the preference when Bluetooth is off since it's only used for showing connected hearing aids and acting as a shortcut to device detail page.

However, the preference is now a new page of multiple controls, we probably shouldn't hide the preference the Bluetooth is off. Those controls should be accessible even if the Bluetooth is off.

Bug: 284092084
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidHelperTest
Change-Id: I647a187d73bd673c8ac8ab366579ba92c22ce1dc
2023-05-25 11:20:11 +00:00
Chaohui Wang
aac2015cc7 Merge "Improve the loading time of DataSaverSummary" into udc-qpr-dev am: b04b977cac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405371

Change-Id: I1ffdee026aa86e7b31b963d8d7ef62613df4fb6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 10:10:40 +00:00
Chaohui Wang
b04b977cac Merge "Improve the loading time of DataSaverSummary" into udc-qpr-dev 2023-05-25 09:38:35 +00:00
danielwbhuang
2fe3307511 Display gesture education button in touchpad settings
1. We hid this button before.
2. Display the button in the latest release.

Bug: 276001904
Test: manual
Change-Id: I20bfc76162eeb99e85afede30e9fe6145251d65d
2023-05-25 17:24:52 +08:00
Viesturs Zarins
ac347eddd9 Fix missing Activity embedding allowlisting for Assistant.
The normal settings fragments are already allowlisted via SubSettingActivity.
ManageApplications fragment based activities are not compatible with that however.

The ManageApplications fragment has several modes that are selected by the activity name, hence cannot use the SpringboardSettings activity to launch just the fragment.

For more context, see
go/conversational-care-activity-embedding-allowlisting

BUG: 282921726

Change-Id: I65872b574ce6272fbd33ab7bd100504a6536f340
2023-05-25 08:43:07 +00:00
Treehugger Robot
1a777429d6 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 0d065f7913 am: 506b8af1b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: Iaa2952f655065661890b47723594ba8730eb76b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 08:17:17 +00:00
Chaohui Wang
ad92fd238c Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: a9a229665b am: 516503df0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: I4832b1dc0837c6d71157e172e69ec452bc16b65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 08:16:55 +00:00
Treehugger Robot
e6095db454 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 48355b8b24 am: e2aea57de4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: Id5549b198f9a5d9cb6925af97ac9f45302122da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 08:12:07 +00:00
Chaohui Wang
b02cf9562a Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: f976ff3f06 am: 6d2caf2e52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: Iee83ddb0f09f5f05f922e7949782a7c838538d3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 08:12:00 +00:00
Treehugger Robot
22acfebdb9 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 0d065f7913 am: 2299f35385
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: Ifb5a172d9977287ab725510a0b2faa4fae33c7a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 08:11:53 +00:00
Chaohui Wang
3ca754c35c Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: a9a229665b am: 85365bf381
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: I33a4bfa4535cfe87156b77b7f58fb54ad5e34ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 08:11:18 +00:00
Treehugger Robot
506b8af1b1 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 0d065f7913
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: I0ba5cc6eb2112440a4b2063f1347fed9406f5ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:33:25 +00:00
Treehugger Robot
e2aea57de4 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 48355b8b24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: I3b4ef57a77546a6078e62eb696fae80363b90d4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:32:19 +00:00
Chaohui Wang
6d2caf2e52 Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: f976ff3f06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: Ia7b7be32a800e70aa117f43717e04cddbadb3370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:32:05 +00:00
Chaohui Wang
516503df0a Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: a9a229665b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: Ia5aaf1c116abef625c43a63619636b18cfe6515f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:31:52 +00:00
Treehugger Robot
2299f35385 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 0d065f7913
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: Ied812c9a81d5945d7a1c3157ef345e359b8c0c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:27:45 +00:00
Chaohui Wang
85365bf381 Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: a9a229665b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: Ic4f862141920da6b3d392c48158fd94eadf1758e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:27:38 +00:00
Treehugger Robot
0d065f7913 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: I46331c040344bcf47c7ce59f37a8ce5378eee961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 06:45:29 +00:00
Chaohui Wang
a9a229665b Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: Ieb36ee51360a0406d62fa500e518be0b4e6dddd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 06:45:21 +00:00
Treehugger Robot
48355b8b24 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: I68dd6ae9bd91519b126cbacb8cba1fb4909524a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 06:41:09 +00:00
Chaohui Wang
f976ff3f06 Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: I271981812af20ac9d666465edea064fba0a2642e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 06:40:44 +00:00
Treehugger Robot
1fd77775cb Merge "[Settings] Use background thread to get VoNr state." into udc-dev 2023-05-25 06:25:55 +00:00
TreeHugger Robot
8163f3d93b Merge "Add a footer message for battery cycle count" into udc-qpr-dev am: 810659f82d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23419678

Change-Id: I906471b83c8554e65de2ba3d4e34468cdb6a5c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 06:23:46 +00:00
Chaohui Wang
5b042e2feb Merge "Fix crash of PictureInPicture" into udc-dev 2023-05-25 06:02:59 +00:00
TreeHugger Robot
810659f82d Merge "Add a footer message for battery cycle count" into udc-qpr-dev 2023-05-25 05:53:19 +00:00