Commit Graph

49340 Commits

Author SHA1 Message Date
Vania Januar
3d2fa4e76b Merge "Minor fixes and tests for multiple full users for stylus notes app" into udc-qpr-dev am: 76f815f7b5 am: 3790a017b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23305328

Change-Id: I9c4bc6b52709c65e91179f3b77831523663412c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 11:03:28 +00:00
Vania Januar
3790a017b9 Merge "Minor fixes and tests for multiple full users for stylus notes app" into udc-qpr-dev am: 76f815f7b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23305328

Change-Id: I93342b240069f866cbd9bb03c4107008d3330368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 10:22:29 +00:00
TreeHugger Robot
f3f28ef42d Merge "Avoid hotspot band updates when country code is inactive" into udc-dev am: f6c0e2d4dd am: b381ab48fc am: 1566527a10 am: 1f646b1024
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23341837

Change-Id: Ic95237962aacd5e5260cb10551a0832f51b06602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 09:47:23 +00:00
Michał Narajowski
4fabbe1389 Merge changes from topic "late-bonding" into udc-dev am: a0c24932ee am: 039fd6adf6 am: bd34c8c190 am: 8be19235dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23317620

Change-Id: I39b1c8591a9d529585697dfbf041d8be0a7f1346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 09:43:34 +00:00
Michał Narajowski
741ca3f022 bt: Add late bonding confirmation mechanism am: 63d37a3d78 am: f38b16808b am: e13e275026 am: efbd4034d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23276700

Change-Id: I645d33a74d98c9583d512b06f8cf783bf275eb2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 09:43:31 +00:00
Vania Januar
76f815f7b5 Merge "Minor fixes and tests for multiple full users for stylus notes app" into udc-qpr-dev 2023-05-19 09:39:05 +00:00
TreeHugger Robot
1f646b1024 Merge "Avoid hotspot band updates when country code is inactive" into udc-dev am: f6c0e2d4dd am: b381ab48fc am: 1566527a10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23341837

Change-Id: Iee1f2b0536746ca5d955e6c3674e7f9a76c5a05e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:59:17 +00:00
Michał Narajowski
8be19235dd Merge changes from topic "late-bonding" into udc-dev am: a0c24932ee am: 039fd6adf6 am: bd34c8c190
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23317620

Change-Id: I5d5b87f0b3e94e0778b63b27fc389f0f175932b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:57:26 +00:00
Michał Narajowski
efbd4034d2 bt: Add late bonding confirmation mechanism am: 63d37a3d78 am: f38b16808b am: e13e275026
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23276700

Change-Id: I66f1a80109916a81e5620572f477b3f44866f370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:57:23 +00:00
TreeHugger Robot
ebea350479 Merge "Avoid hotspot band updates when country code is inactive" into udc-dev am: f6c0e2d4dd am: b381ab48fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23341837

Change-Id: I72f1451a3b7cd370366454c7954f56646e03db8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:37:28 +00:00
Michał Narajowski
e29ec31eec Merge changes from topic "late-bonding" into udc-dev am: a0c24932ee am: 40299749e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23317620

Change-Id: I660cdf43190bfa9afc7f34b717dfc95b16a71173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:37:16 +00:00
Michał Narajowski
68dc05399f bt: Add late bonding confirmation mechanism am: 63d37a3d78 am: 9a922ed45b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23276700

Change-Id: Ia22b40d8c06a31042a0247f99528c19d9a8af646
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:37:13 +00:00
TreeHugger Robot
1566527a10 Merge "Avoid hotspot band updates when country code is inactive" into udc-dev am: f6c0e2d4dd am: b381ab48fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23341837

Change-Id: Ife422b79a3daf07bdc083730d890873340d42f8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:35:34 +00:00
Michał Narajowski
bd34c8c190 Merge changes from topic "late-bonding" into udc-dev am: a0c24932ee am: 039fd6adf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23317620

Change-Id: Id35dad00ba27e552c41f699d1123946234d906f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:15:06 +00:00
Michał Narajowski
e13e275026 bt: Add late bonding confirmation mechanism am: 63d37a3d78 am: f38b16808b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23276700

Change-Id: I46e70bb2ceab07ad4da475bd3676a08dc81c12f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:15:04 +00:00
TreeHugger Robot
b381ab48fc Merge "Avoid hotspot band updates when country code is inactive" into udc-dev am: f6c0e2d4dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23341837

Change-Id: Ib085e91a027746460b1d49928e1e40c5ac17d166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:12:31 +00:00
Michał Narajowski
40299749e8 Merge changes from topic "late-bonding" into udc-dev am: a0c24932ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23317620

Change-Id: I2ab5410a9ed3e71b244bfa96e2e4ab81ed6907f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 07:53:44 +00:00
Michał Narajowski
9a922ed45b bt: Add late bonding confirmation mechanism am: 63d37a3d78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23276700

Change-Id: I3e25d666841dca8eca24212278173c60cf71ce50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 07:53:43 +00:00
Michał Narajowski
039fd6adf6 Merge changes from topic "late-bonding" into udc-dev am: a0c24932ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23317620

Change-Id: I75617229e5e6126b249af4e9602878159543fb46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 07:52:28 +00:00
Michał Narajowski
f38b16808b bt: Add late bonding confirmation mechanism am: 63d37a3d78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23276700

Change-Id: Ibc59792c6d9a2d2e893fca32c534fc01250ac47d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 07:52:25 +00:00
TreeHugger Robot
f6c0e2d4dd Merge "Avoid hotspot band updates when country code is inactive" into udc-dev 2023-05-19 07:40:54 +00:00
Michał Narajowski
a0c24932ee Merge changes from topic "late-bonding" into udc-dev
* changes:
  bt: Show additional message when is late bond
  bt: Add late bonding confirmation mechanism
2023-05-19 07:34:50 +00:00
Weng Su
8b7e0d7c88 Avoid hotspot band updates when country code is inactive
- The SAP usable channels cannot be queried when the country code is not activated, causing UI to display wrong design

Bug: 280554293
Test: Manual test
atest -c WifiHotspotRepositoryTest

Change-Id: I58e8879438d7a630808aa2c4b69f21eb19968ab1
2023-05-19 12:51:50 +08:00
David Duarte
7822c58be7 Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f am: 889aa2cdda am: 6fd428956e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176

Change-Id: I6bc1dcb5a516a0cef374c663fa63344e1de71f5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:58:37 +00:00
David Duarte
88521c503d Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f am: ba0c3d698e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176

Change-Id: Iefb459893983203e9d2cd74bbb1d9515c3972de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:14:48 +00:00
David Duarte
46fd70f5e9 Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f am: 889aa2cdda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176

Change-Id: I1d93f62feac935c10dea88d01a16170dbae1013a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:14:30 +00:00
David Duarte
6fd428956e Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f am: 889aa2cdda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176

Change-Id: I848b57bccf9b4cd3774fd367db1053146c54358c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:11:56 +00:00
David Duarte
414feacede Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176

Change-Id: I4bbb93e4879c668e6e350e0e7a41ba0c11494b24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:29:26 +00:00
David Duarte
889aa2cdda Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176

Change-Id: I021a71139d6cd453735e279167984863b982dbf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:26:34 +00:00
David Duarte
2920cad66f Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev 2023-05-18 21:58:59 +00:00
Michał Narajowski
01164fd414 bt: Show additional message when is late bond
Sometimes the cached bluetooth device is not found and we the
BluetoothPairingController does not know if this device is a member of a
set. But if this is a late bond then it is a set member so we still want
to display that additional message.

Bug: 282193044
Test: manual
Tag: #feature
Change-Id: I9e7da093b118a81097dc83460e9b93ce2e477482
2023-05-18 15:50:10 +00:00
Vania Januar
3042747ddb Minor fixes and tests for multiple full users for stylus notes app
Test: StylusDevicesControllerTest
Bug: 278555728
Change-Id: I0279cb8d9aba4781958e1e5937447501876919ec
2023-05-18 15:16:48 +00:00
Allen Su
bcfb1e22f6 Merge "Fix dialog disappear when screen off and on" 2023-05-18 13:17:46 +00:00
Daniel Huang
f9aaa71f07 Merge "Use FeatureProvider to provide the firmware update category." into udc-qpr-dev am: e69db09a88 am: dc777ee31a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23260256

Change-Id: I2c7b0566cddd133955dfc52b021d8e185053fb9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 12:59:45 +00:00
SongFerngWang
6f03ff77be To refresh/register/unregister all of the devices with same groupId am: ef7a75c394 am: 64281594d1 am: e753279de9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381

Change-Id: Ib152afd17b516ed7e1bb4e22b686e9c84ed5527d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 11:17:34 +00:00
Daniel Huang
dc777ee31a Merge "Use FeatureProvider to provide the firmware update category." into udc-qpr-dev am: e69db09a88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23260256

Change-Id: Ic69efc116c521b49d3851b1351aee433f2b34ceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 11:17:03 +00:00
SongFerngWang
e753279de9 To refresh/register/unregister all of the devices with same groupId am: ef7a75c394 am: 64281594d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381

Change-Id: I30a0b272d94a33ea9ab9d67ba547527750c23e5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 11:13:44 +00:00
SongFerngWang
8b35fb1a1d To refresh/register/unregister all of the devices with same groupId am: ef7a75c394 am: 64281594d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381

Change-Id: Ie19c94f9bc88263312d1e1d1ac0c6c728993b7f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 11:12:02 +00:00
SongFerngWang
761fd9386d To refresh/register/unregister all of the devices with same groupId am: ef7a75c394 am: 530393901e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381

Change-Id: I0fa51b4533f02f50e6ad0eec0ec01c2f5bf862b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 11:11:24 +00:00
Michał Narajowski
63d37a3d78 bt: Add late bonding confirmation mechanism
If a coordinated set member is bonding late the user will be notified and
asked for confirmation on pairing with this device. The dialog box will
display specific message for this case.

Bug: 282193044
Test: manual
Tag: #feature
Change-Id: Ie9d79282dd432a542ea02ef477019be6dfbce997
2023-05-18 10:47:12 +00:00
SongFerngWang
64281594d1 To refresh/register/unregister all of the devices with same groupId am: ef7a75c394
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381

Change-Id: I715fcfd8d93f557a485b2caba663fd8bb40851f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 10:31:41 +00:00
SongFerngWang
be615f9351 To refresh/register/unregister all of the devices with same groupId am: ef7a75c394
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381

Change-Id: I2b7c50fad0b06cbbe5d9417d136feb498d1f112c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 10:31:39 +00:00
Daniel Huang
e69db09a88 Merge "Use FeatureProvider to provide the firmware update category." into udc-qpr-dev 2023-05-18 10:27:54 +00:00
Allen Su
998933a44d Fix dialog disappear when screen off and on
Bug: 248514263
Test: by manual
Change-Id: Ieac71f57b8672204dd2bc6c1c39e473d0ffa25cf
2023-05-18 10:27:52 +00:00
danielwbhuang
6189f9fcbd Use FeatureProvider to provide the firmware update category.
1. Add KeyboardSettingsFeatureProvider in FeatureFactory.
2. Use KeyboardSettingsFeatureProvider to add firmware update UI.

Bug: 270114180
Test: manual, atest KeyboardSettingsFeatureProviderImplTest
Change-Id: I62ec7aff71dd5c0d496860363f2c5b3e992503ff
2023-05-18 17:24:43 +08:00
SongFerngWang
ef7a75c394 To refresh/register/unregister all of the devices with same groupId
Since the LE audio have two or more devices in the same group and
the UI show their status at one preference, the UI need to register
callback for each of the devices, and also refresh the deviceList.

Bug: 278155752
Test: local test to pairing the device and check the battery part
Change-Id: I2fcde92a1f68b8437465b234820f7bad13dfc444
2023-05-18 16:28:52 +08:00
Vania Januar
d9562be0d3 Merge "Disambiguate default notes app user from stylus settings" into udc-qpr-dev am: 2e8e1339a2 am: 0277f1676e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990296

Change-Id: I9663363fdb87ecef957efd813a658759304dc681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 17:05:35 +00:00
Julia Tuttle
2af8ee4e4e Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: 2474419ac8 am: e7eb3ab983
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: I797efe5d35c4ad315cf399956dba952674f2223b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 16:41:49 +00:00
Vania Januar
0277f1676e Merge "Disambiguate default notes app user from stylus settings" into udc-qpr-dev am: 2e8e1339a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990296

Change-Id: Iabe40045f8193d3b532881d454fd0cf22c748953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 16:41:30 +00:00
Julia Tuttle
e7eb3ab983 Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: 2474419ac8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: I8d705d71901d00877f9b51faebf7810a18aa20e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 16:37:32 +00:00