Commit Graph

128074 Commits

Author SHA1 Message Date
Michał Narajowski
b2c25f13c8 Merge changes from topic "late-bonding" into udc-dev am: a0c24932ee am: 40299749e8 am: 2d9016fe4c am: df84f1d39d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23317620

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

Change-Id: I7c9af10f3eaecd73d1fa59536e20ba65a082c9e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 09:46: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
Michał Narajowski
df84f1d39d Merge changes from topic "late-bonding" into udc-dev am: a0c24932ee am: 40299749e8 am: 2d9016fe4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23317620

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

Change-Id: Ia6386b55e9d23cc6b841b1951826cc030c47a861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:58:43 +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
Michał Narajowski
2d9016fe4c 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: I1846f36c2a4da101e6bf44a952bd3bf0d2f6997b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:35:09 +00:00
Michał Narajowski
1ca0a492bc 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: I1cd25078948405e1a7c3465baf93398b001b9c7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:35:07 +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
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
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
David Duarte
71cd335ab8 Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f am: 889aa2cdda am: 46fd70f5e9 am: f30455ae4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176

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

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

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

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

Change-Id: I797141caba6b3c0f19f7dfeb07d0b4cf500f6996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:59:48 +00: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
9b5e6b8b69 Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f am: 414feacede
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176

Change-Id: Ie0afa7a4ff0b53a8730a8b1e9713acf5c59fe142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:14:06 +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
ba0c3d698e 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: I0103526a3f590cb9d2673143f32566e6366e99ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:26:25 +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
Bill Yi
93fea872a7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: f1e3e4680b -s ours am: c0081daf78 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23281837

Change-Id: I031a2d7e42b43424fdcacafe928984d359adb628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 20:07:37 +00:00
Bill Yi
5ceadf2acc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 245213ef30 -s ours am: 4bae519128 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23281837

Change-Id: I30c2a0b4e868e57d8e3bfe982314179cc2833a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 20:07:31 +00:00
Bill Yi
e167bad8a6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 6ea15d4b95 -s ours am: 86c1cea5e7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23281739

Change-Id: I74a41d3f86b286fac3b23a611eb3797a7c56d68d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 20:07:25 +00:00
Bill Yi
9d99ed029e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c81b238626 -s ours am: 000cc48265 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23281739

Change-Id: Ib181e14fa76c25a9955d9fb871bed6f0636f916b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 20:06:53 +00:00
Bill Yi
02fd77eeed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 4fc4c207f7 -s ours am: f3b120afb0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280853

Change-Id: I13eead0f9b81de917703d6838eea43a1f0cae9af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 20:06:32 +00:00
Bill Yi
f1ffed110f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d4eef3f33 -s ours am: bf85d5dcf3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280853

Change-Id: I53a6dd18520524db70cd22f3e53e362ef82d3ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 20:06:13 +00:00
Bill Yi
c0081daf78 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: f1e3e4680b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23281837

Change-Id: Id0ed26e095ea277fe8982b67cedc68c826051863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 18:41:02 +00:00
Bill Yi
4bae519128 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 245213ef30 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23281837

Change-Id: I7f48c835611b785a9f7f45c8b07fa834816af616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 18:40:59 +00:00
Bill Yi
86c1cea5e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 6ea15d4b95 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23281739

Change-Id: I231e0dc967e9aff257e0513a4301f3ecad8c6241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 18:40:53 +00:00
Bill Yi
000cc48265 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c81b238626 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23281739

Change-Id: I43ab0fdae54009d9e21052826709e589391da219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 18:40:45 +00:00
Bill Yi
f3b120afb0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 4fc4c207f7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280853

Change-Id: Ia603a3244d6e89540077c6c49728cd55e9df818b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 18:40:12 +00:00
Bill Yi
bf85d5dcf3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d4eef3f33 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280853

Change-Id: I5947b503f69ce22638cac430b8c5a4352daf464b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 18:39:38 +00:00
Bill Yi
f1e3e4680b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-05-18 17:22:22 +00:00
Bill Yi
6ea15d4b95 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-05-18 17:22:22 +00:00
Bill Yi
4fc4c207f7 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-05-18 17:22:22 +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
Allen Su
bcfb1e22f6 Merge "Fix dialog disappear when screen off and on" 2023-05-18 13:17:46 +00:00
SongFerngWang
93525c07f1 To refresh/register/unregister all of the devices with same groupId am: ef7a75c394 am: be615f9351 am: d010dddaa0 am: 2309118ea2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381

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

Change-Id: Ie1f6a71bf4a51e342f0ab4fea6849f1145ba8a39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 13:01:36 +00:00