Commit Graph

48602 Commits

Author SHA1 Message Date
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
1fd77775cb Merge "[Settings] Use background thread to get VoNr state." into udc-dev 2023-05-25 06:25:55 +00:00
Chaohui Wang
5b042e2feb Merge "Fix crash of PictureInPicture" into udc-dev 2023-05-25 06:02:59 +00:00
tom hsu
97a1fc643e [Settings] Use background thread to get VoNr state.
- TelephonyManager#isVoNrEnabled may not send back the result in time,
   so use different thread and timer to prevent ANR.

Bug: 282876876
Test: atest passed
Change-Id: Ie6cc0f8a459f5ebed930e457dacb9b742df70fad
2023-05-25 10:56:03 +08:00
Diya Bera
f868f3fdda Fingerprint Error Dialog am: 71dd391e4d am: 565ce9eaae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: Iea6e58fda55aadc31aef0aca6736f874e9c9ed1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 20:56:45 +00:00
Diya Bera
565ce9eaae Fingerprint Error Dialog am: 71dd391e4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: I614f3cbc3845d463c83605bb62c007180408834d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 20:14:53 +00:00
Diya Bera
71dd391e4d Fingerprint Error Dialog
Add "Try Again" for UNABLE_TO_PROCESS error. Change default title
string. Custom strings for Settings and Setup.

Bug: 280786940
Test: Try to enroll fingerprint, trigger a corresponding error and check
the error dialog

Change-Id: I5975d169e1d33cff87f58fb8882261bb1bd3520e
2023-05-24 10:15:52 -07:00
Chaohui Wang
ce56dcc30b Fix crash of PictureInPicture
This follows change I3115cf1b99a305efef192a0dcf3e809eb7903d0a

PackageManager.getPackageInfoAsUser() will throw exceptions when the
package is too large which is a known issue to PackageManager but very
low priority given resourcing constraints. As per the PackageManager
team suggestion, catch the exception on the app side to alleviate the
impact to the PictureInPicture & App info page.

Fix: 283076353
Fix: 283354211
Test: Unit test
Change-Id: Iad2bf9fbfca6ee7f604fec1c4afa1b9382f6ec7e
2023-05-24 19:41:20 +08:00
SongFerng Wang
29c01f1357 Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e am: 75dd8a0a91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

Change-Id: I00756b8f15758d3c6217114036cf14d9d1eaf3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 10:36:00 +00:00
SongFerng Wang
535a91afff Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

Change-Id: I5480462b9262f5d8ee51f23a97d3bde7ab39082c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 10:14:58 +00:00
SongFerng Wang
75dd8a0a91 Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

Change-Id: I1f0f8264b33b5b826d54da4adca8c2c4409af79b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 10:10:09 +00:00
SongFerngWang
1872151b4f The BluetoothDevicePreference register the MetadataChanged
The bluetooth device preference needs to refresh UI after MetadataChanged
Fix: 282877247
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicePreferenceTest

Change-Id: I02cb07a6b255242e4877089ce2f3b7559ce02362
2023-05-24 04:49:41 +00:00
Angela Wang
b89762e58f Merge "Add new bond entry to HearingAidInfoReported" into udc-dev am: 07563f6269 am: 5821b2c9cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23345338

Change-Id: I74467553fd67caa12700f0e2b2c6dcc5af787b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 04:09:48 +00:00
Angela Wang
e969ce77f8 Merge "Add new bond entry to HearingAidInfoReported" into udc-dev am: 07563f6269
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23345338

Change-Id: If2b609d4f6edf0bee1220d38d6419419ce819e61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 03:30:41 +00:00
Angela Wang
5821b2c9cc Merge "Add new bond entry to HearingAidInfoReported" into udc-dev am: 07563f6269
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23345338

Change-Id: Ic8325571466b6d382a9c7e359ffa8c0d1e6b37b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 03:30:30 +00:00
Angela Wang
07563f6269 Merge "Add new bond entry to HearingAidInfoReported" into udc-dev 2023-05-23 02:30:07 +00:00
Lucas Silva
308d4f1e46 Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17 am: 2611253691
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459

Change-Id: Idf7390468792fca7dd34d53efd964580ec5c4567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 21:47:12 +00:00
Lucas Silva
2611253691 Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459

Change-Id: I05815946cd5be092dbba4767bb9e855e81060ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 21:08:59 +00:00
Lucas Silva
975b03405f Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459

Change-Id: Ibd8e11b0cd11ff6ecb17a5b71ae8895e850d5b12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 21:04:21 +00:00
Lucas Silva
5bce93eb17 Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev 2023-05-22 20:35:16 +00:00
Aleksandar Kiridžić
6ec7ba0d5b Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372 am: 24428d1863
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398

Change-Id: I88e5b182e607e9b6cd5a8caafd38cd607ec4fbff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 16:37:25 +00:00
Aleksandar Kiridžić
b5d3fc5b53 Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398

Change-Id: I78b084b6a61b579ec92c183463dde22f44367bbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 16:13:19 +00:00
Aleksandar Kiridžić
24428d1863 Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398

Change-Id: I147940935719c7baa482fa6f9b8a0111d4bdb4ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 16:12:09 +00:00
Aleksandar Kiridžić
bcae90c372 Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev 2023-05-22 15:40:08 +00:00
Behnam Heydarshahi
66dd57ea6e Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447

Change-Id: Ie146780b807211d786039a5d022d3be8246616e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 14:49:15 +00:00
Behnam Heydarshahi
ffbc25e249 Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0 am: 2aecb2f1ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447

Change-Id: I70ddbb0ecd7a1553a8d07b3ee47c305399edeb58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 14:48:56 +00:00
Behnam Heydarshahi
2aecb2f1ea Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447

Change-Id: I6798c7a2e2020eb1ca4dbe6dbf1cb7ccc50a76b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 14:21:55 +00:00
Behnam Heydarshahi
7aa8424cc0 Merge "Remove volume_separate_notification flag" into udc-dev 2023-05-22 14:09:22 +00:00
Himanshu Gupta
783069217f Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948 am: af793d86f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: Id0c01cecf1b24afea3f07a7395217b656a91a512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 21:54:28 +00:00
Himanshu Gupta
59651f68af Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: Ie4a5bcf554ab4bc20acc00e868c79ac5a54320c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 21:15:21 +00:00
Himanshu Gupta
af793d86f2 Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239

Change-Id: I5afbb8497652ad9e61af90617d0f5ed8e35c8a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 21:12:35 +00:00
Himanshu Gupta
4740720948 Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev 2023-05-19 20:28:36 +00:00
Aleksandar Kiridzic
30fd927eba speech: Remove hard-coded preference key from the controllers
OnDeviceRecognitionPreferenceController and TtsPreferenceController
had their preference keys hard-coded which was breaking
AccessibilitySettingsTest. The key is now left to be read
from the super constructor.

Bug: 283449837
Test: Manual, already existing robotests
Change-Id: Ibe11a2134fffea0a081ca9f5e2f9441911574efa
2023-05-19 21:11:19 +01:00
Nicolas Sleiman
60e25e30e1 Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58 am: 123fa6ae78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: I616281d105e7c5792b515501970526689bc104ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 16:13:52 +00:00
Ankita Vyas
2af208be41 Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862 am: 8053e9da26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: I77f0b8361c02d61941b5cc1c34ffdc79ecef43d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 16:13:27 +00:00
Lucas Silva
9872f4322b Disable dreams home controls button when disabled on lockscreen.
When home controls are disable on lockscreen, we should also disable
them on dreams.

Bug: 282680621
Test: flashed device, disabled/enabled home controls on lockscreen and
verified that dreams home controls button was hidden/shown correctly
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.DreamHomeControlsPreferenceControllerTest"

Change-Id: I535b079cabc2838e77f3afc74bb8f8730b850653
2023-05-19 11:46:39 -04:00
Nicolas Sleiman
123fa6ae78 Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: I47dddd7f1cda8c069584460ecfbf2d94fcfb0684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 15:38:01 +00:00
Nicolas Sleiman
008a5b24b5 Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev am: 03e8dbca58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23347979

Change-Id: I78483e25ac6fd54ee99295c68a1d1e76a59bad48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 15:37:13 +00:00
Ankita Vyas
915741a00d Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: I642beff62fac8c46054c0d35cf2ba95b63dccce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 15:36:17 +00:00
Ankita Vyas
8053e9da26 Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev am: 96cff64862
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23343098

Change-Id: I0a677cc8eb7e6054e3f0780fcdb06db57309738a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 15:36:11 +00:00
Nicolas Sleiman
03e8dbca58 Merge "Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings" into udc-dev 2023-05-19 15:08:35 +00:00
Ankita Vyas
96cff64862 Merge "Remove GET_ACTIVITIES flag while fetching installed apps from package manager." into udc-dev 2023-05-19 15:06:39 +00:00
nsl
f3241ee339 Remove GET_ACTIVITIES in InteractAcrossProfiles in Settings
Remove the GET_ACTIVITIES flag in InteractAcrossProfiles in Settings to
follow ag/23343098

Bug: 283407612
Test: InteractAcrossProfilesSettingsTest
Change-Id: I299a4a40af3e59f729027b964e938d7783eb7d92
2023-05-19 12:31:27 +00:00
Aleksandar Kiridžić
741aab96b8 Merge "speech: Re-add on-device speech recognition settings entry" into udc-dev am: 9e2e6d0795 am: 13317c14f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932716

Change-Id: I253e789d2df8c55660fb99d432c06868d832746b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 11:19:59 +00:00
Aleksandar Kiridžić
13317c14f1 Merge "speech: Re-add on-device speech recognition settings entry" into udc-dev am: 9e2e6d0795
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932716

Change-Id: I1f5b3724ce495f55f233678686acdcc25f468c55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 10:42:04 +00:00
Aleksandar Kiridžić
ae7734030b Merge "speech: Re-add on-device speech recognition settings entry" into udc-dev am: 9e2e6d0795
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932716

Change-Id: Ibd41d45a99f208344e7bfc0c4eab2587b574db82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 10:37:33 +00:00
Aleksandar Kiridžić
9e2e6d0795 Merge "speech: Re-add on-device speech recognition settings entry" into udc-dev 2023-05-19 10:02:56 +00:00