Treehugger Robot
9526a60e6b
Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795
Change-Id: Ic2fb8afdd80cd3892aeccb45fafec6b65de1e68f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 01:55:21 +00:00
Treehugger Robot
ca3aa2a557
Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device"
2023-03-24 01:24:50 +00:00
Rahul Sabnis
b1e25950b8
Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously
...
connected on the same device
Removes the classic audio toggles for dual mode audio devices.
Bug: 257881495
Test: Manual
Change-Id: Ie6794b4d904c74a7c5137ad141172c10188a99f9
2023-03-23 16:51:49 -07:00
Treehugger Robot
7b4a3ada12
Merge "Hide TTS search results if no TTS engine is available" am: 993f582fca
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2493859
Change-Id: Idaedbac33bebafb96ee87fb4e396a88a41708e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-23 09:39:15 +00:00
Treehugger Robot
993f582fca
Merge "Hide TTS search results if no TTS engine is available"
2023-03-23 09:02:49 +00:00
Betty Chang
00a7d0788f
Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495497
Change-Id: I5ea028e5cab8a83b445d5590f0ae9f3965fb8e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 09:53:01 +00:00
Betty Chang
9541363952
Merge "[LE Audio] Set activity for result after scanning the QR code"
2023-03-20 09:28:31 +00:00
Betty Chang
1de44c2447
Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495740
Change-Id: I3747bf58a841c0c0213d6b27525d9aee992f85bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 06:59:18 +00:00
changbetty
7cf90fbe36
[LE Audio] Set activity for result after scanning the QR code
...
Bug: 263554347
Bug: 265281156
Bug: 248409874
Test: manual test
Change-Id: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
Merged-In: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
2023-03-20 06:48:36 +00:00
Betty Chang
18eb985e41
Merge "[LE Audio] To remove the broadcast source item that created by receive state"
2023-03-20 06:33:42 +00:00
changbetty
85dd572f18
[LE Audio] To remove the broadcast source item that created by receive
...
state
- When the user clicks another broadcast source and wants to join,
we will remove the previous item that created by getAllSource().
And trigger the search again.
Bug: 242267719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothBroadcastSourcePreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothFindBroadcastsFragmentTest
Change-Id: I416f0a39e31276876e63360664555f99dd7297c9
Merged-In: I416f0a39e31276876e63360664555f99dd7297c9
2023-03-20 05:48:34 +00:00
Pingzhi Wang
417b4a8537
Hide TTS search results if no TTS engine is available
...
If there is no Text-to-speech engine available/installed then
disable page search
Bug: 274007225
Test: Manual
Change-Id: Id734a69e742d9598be6824177d1a7d115ba6e594
2023-03-17 11:25:14 +01: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
Xin Li
19ca5d6a6e
Merge "Merge Android 13 QPR2"
2023-03-14 21:40:40 +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
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
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
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
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
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
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
Patty Huang
0086b200d0
Merge "Add LE Audio allow list feature switcher in the developer option menu" am: 5bb798f518
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2387973
Change-Id: Ibb05089fd8a8245966e5ff9817e4a25833ccd442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 05:54:06 +00:00
Patty Huang
5bb798f518
Merge "Add LE Audio allow list feature switcher in the developer option menu"
2023-03-06 05:14:07 +00:00
Treehugger Robot
5e84729b10
Merge "Add getSubscriptionId API" am: 7813c4a9a3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2470383
Change-Id: I8d3584c77241e2d273bccf1d97ad592501d9afd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 19:10:17 +00:00
Treehugger Robot
7813c4a9a3
Merge "Add getSubscriptionId API"
2023-03-04 18:38:35 +00:00
Jack Yu
bc71ee5ece
Add getSubscriptionId API
...
The old getSubId or getSubscriptionIds return multiple sub ids
per slot index, which is not possible in today's implementation
because the slot index here refers to the logical slot index,
which is also known as phone id, or the logical modem index. In
today's telephony, one logical phone can only have one
subscription at one time, so does the modem.
Bug: 239607619
Test: Manual
Merged-In: I0a43d33daf523e6f0bea054c8965281bafbbcaa4
Change-Id: I0a43d33daf523e6f0bea054c8965281bafbbcaa4
2023-03-03 19:40:50 -08:00
Bill Yi
ea2310e0fe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: Ia4c3858ec103f63ee8da598b5263c32aa12c2214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:34:35 +00:00
Bill Yi
960eae9a2f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: I70efdf826f91370e142e2001bcc787b102125430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:34:32 +00:00
Bill Yi
71ad7ad49e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: I21f3db8861e7bd07d1fb4c4325989425862ebaa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:34:30 +00:00
Bill Yi
9de8ff63dd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: Ic316185ed34b2ba3801f22f7013cca419f30a090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:34:22 +00:00
Bill Yi
cac65afe79
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: If1ad768e127f48cb041a2f486e41bd1539c41224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:34:06 +00:00
Bill Yi
d3fa508918
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: I173610558cc94901d1b48f39cc99964e5a0a55ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:33:38 +00:00
Bill Yi
839c6e88b4
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-03-01 00:47:17 +00:00
Bill Yi
798dd47215
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-03-01 00:47:17 +00:00
Bill Yi
586da77594
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-03-01 00:47:17 +00:00
Ahaan Ugale
b238ee99cc
Merge "Update Autofill OWNERS" am: e35606efd3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329
Change-Id: I3837d1677ee9769f9dd5ff88d6eedbdaf97b94e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 23:23:30 +00:00
Ahaan Ugale
e35606efd3
Merge "Update Autofill OWNERS"
2023-02-28 22:42:36 +00:00
Chris Li
77a23c9ce2
Update EmbeddingAspectRatio to the latest
...
alwaysAllow() is changed to ALWAYS_ALLOW per API Council feedback.
Bug: 270160592
Test: build
Change-Id: I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0
(cherry picked from commit af2b07b248
)
(cherry picked from commit 1092486873
)
2023-02-28 17:13:39 +00:00
TreeHugger Robot
8e002f962e
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2023-02-27 23:59:16 +00:00
TreeHugger Robot
3f75c80642
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2023-02-27 23:59:16 +00:00
Ahaan Ugale
4ee69bf644
Update Autofill OWNERS
...
Change-Id: Ibed8c68111fe6cab9152b4e0bf7d4378e4932806
2023-02-27 21:44:20 +00:00
Bill Yi
2ff8ea95f2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I93d99960420b9066bdd86b961f57596bc9cf5175
2023-02-26 20:55:20 -08:00
Bill Yi
10e200b5ad
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6bb25af5ba623e2d04c42829db1220ad5f64211d
2023-02-26 20:54:04 -08:00
Bill Yi
d77ddd6ab3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I34927005a077f306b6c8c0d1c850ed39474f33a4
2023-02-26 20:52:03 -08:00