Commit Graph

98647 Commits

Author SHA1 Message Date
Alice Kuo
b15a241343 [automerger skipped] Do not update the previously connected devices for the sub device am: c78fb83aee am: f6f0126b8e am: 1da3264140 am: 3d17582b0b -s ours
am skip reason: Merged-In I03dfdc25b57e614194fb8de2c9265edd50760d30 with SHA-1 a6d549fee3 is already in history

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

Change-Id: I525a8b4366da12423d27b38a1be851d2a6e5ac41
2021-11-29 03:19:20 +00:00
Alice Kuo
4283b7c1dc [automerger skipped] Accept the pairing request automatically for the set member pairing am: 61460a1ab1 am: 6aa53808f3 am: c932678888 am: 31e82a325c -s ours
am skip reason: Merged-In I40afabb09b4cb12a0253035452c9f6974799ed05 with SHA-1 e920efeb3a is already in history

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

Change-Id: Ie0d87b73b8df1a6f0fea8e0f4bc0c09778abfe10
2021-11-29 03:19:19 +00:00
Alice Kuo
4c9912b73b [automerger skipped] Show the multiple Mac address for the coordinated set am: 9f11a4cddf am: f0b73dade7 am: e3680e211a am: 2240418de8 -s ours
am skip reason: Merged-In I01e0ec91e5c856481318d6435d174b5a2018d820 with SHA-1 133c2cc1cc is already in history

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

Change-Id: I0256cff2f3398b684ba78dd9a1c945575f376351
2021-11-29 03:19:17 +00:00
Alice Kuo
14be1d377e [automerger skipped] Add the pairing string for CSIP supported device am: f57f720c38 am: 5d1aee76c2 am: 2135db2eac am: 6943c0356c -s ours
am skip reason: Merged-In I5432b7264652dd4485e2669f6004caa4f7459238 with SHA-1 02cadb9b32 is already in history

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

Change-Id: Ie17bf43f8755ead22ff544be33dca53a8e73978c
2021-11-29 03:19:16 +00:00
Alice Kuo
3d17582b0b Do not update the previously connected devices for the sub device am: c78fb83aee am: f6f0126b8e am: 1da3264140
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903833

Change-Id: I4e83de75cd61c7f3fcf418bfdefc79d655c063f9
2021-11-29 03:04:13 +00:00
Alice Kuo
31e82a325c Accept the pairing request automatically for the set member pairing am: 61460a1ab1 am: 6aa53808f3 am: c932678888
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903832

Change-Id: I205a7824d84a42128be5be2e77974689510d190a
2021-11-29 03:04:12 +00:00
Alice Kuo
2240418de8 Show the multiple Mac address for the coordinated set am: 9f11a4cddf am: f0b73dade7 am: e3680e211a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831

Change-Id: I126e164160dae141978a59b02cea9f0091b7265f
2021-11-29 03:04:10 +00:00
Alice Kuo
6943c0356c Add the pairing string for CSIP supported device am: f57f720c38 am: 5d1aee76c2 am: 2135db2eac
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I000242e2e51627507bb49e7f6f51d8a5602de493
2021-11-29 03:04:07 +00:00
Alice Kuo
1da3264140 Do not update the previously connected devices for the sub device am: c78fb83aee am: f6f0126b8e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903833

Change-Id: I2f2bf3cac4b0712b8e06beb84b15e6647ccb3130
2021-11-29 02:48:46 +00:00
Alice Kuo
c932678888 Accept the pairing request automatically for the set member pairing am: 61460a1ab1 am: 6aa53808f3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903832

Change-Id: Ic7bc92ee8409a22c74e701b0a7b52d841fc12a4d
2021-11-29 02:48:45 +00:00
Alice Kuo
e3680e211a Show the multiple Mac address for the coordinated set am: 9f11a4cddf am: f0b73dade7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831

Change-Id: I65a4d227e8f92b155636d8aa51b4e5e83bac2b3d
2021-11-29 02:48:44 +00:00
Alice Kuo
2135db2eac Add the pairing string for CSIP supported device am: f57f720c38 am: 5d1aee76c2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I51ff75f8a8005985a9696616edd1c8c5cdd651fe
2021-11-29 02:48:43 +00:00
Alice Kuo
f6f0126b8e Do not update the previously connected devices for the sub device am: c78fb83aee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903833

Change-Id: I3c062b23b8772496cb149ad1eff8483836a79289
2021-11-29 02:29:31 +00:00
Alice Kuo
6aa53808f3 Accept the pairing request automatically for the set member pairing am: 61460a1ab1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903832

Change-Id: I2cce585de893512005af7abf35f5729351512cea
2021-11-29 02:29:30 +00:00
Alice Kuo
f0b73dade7 Show the multiple Mac address for the coordinated set am: 9f11a4cddf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831

Change-Id: I9a8a0fe9d95a4ff4adc0599ce4c9a35501968f71
2021-11-29 02:29:29 +00:00
Alice Kuo
5d1aee76c2 Add the pairing string for CSIP supported device am: f57f720c38
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I809634c657558da125e72bb1fcbddaf3db46a093
2021-11-29 02:29:27 +00:00
Sergey Nikolaienkov
13d7e086e6 Merge "Fix usage of the updated CDM APIs" 2021-11-26 06:38:03 +00:00
Bonian Chen
c74232597e Merge "[Settings] Move display of VPN version into summary text" 2021-11-26 05:44:35 +00:00
Vineeth Bhende
f28a1afac9 Merge "Typo fix in media settings title variable" 2021-11-26 05:44:02 +00:00
Alice Kuo
c78fb83aee Do not update the previously connected devices for the sub device
As bluetooth turn on, and device reboot, UI will show the sub device
entry for hearing aid device or csip device. Check if the device is a sub device, do not update the cachedDevice information.

Bug: 150670922
Bug: 178981521
Test: bonded with a coordinated set. Check the UI only have one entry as Bluetooth turn on and device reboot.
Change-Id: I03dfdc25b57e614194fb8de2c9265edd50760d30
Merged-In: I03dfdc25b57e614194fb8de2c9265edd50760d30
2021-11-26 13:34:12 +08:00
Alice Kuo
61460a1ab1 Accept the pairing request automatically for the set member pairing
Check the pairing request from which device that if it's the outgoing
set member pairing, accept the pairing request automatically to make the
CSIP pairing seamless.

Bug: 178981521
Bug: 150670922
Test: Pair one of the CSIP device, and confirm the other set member can
paired without the confirmation from user

Change-Id: I40afabb09b4cb12a0253035452c9f6974799ed05
Merged-In: I40afabb09b4cb12a0253035452c9f6974799ed05
2021-11-26 13:22:15 +08:00
Alice Kuo
9f11a4cddf Show the multiple Mac address for the coordinated set
Show the mac address for all the devices if the device detail combine
with the multiple connections based on CSIP.

Screenshot: https://screenshot.googleplex.com/qQjc2pxNTr3tMUV

Bug: 178981521
Test: pair with the coordinated set, and check the UI
Change-Id: I01e0ec91e5c856481318d6435d174b5a2018d820
Merged-In: I01e0ec91e5c856481318d6435d174b5a2018d820
2021-11-26 13:21:48 +08:00
Alice Kuo
f57f720c38 Add the pairing string for CSIP supported device
Show the pairing dialog with the hint message
that pairing this device will pair all of the
set member of a coordinated set. If the device
supports CSIP, the message will be shown.

Screenshot: https://screenshot.googleplex.com/8WcrdgBoLRgJjHs

Bug: 178981521
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BlueotohPairingDialog
Change-Id: I5432b7264652dd4485e2669f6004caa4f7459238
Merged-In: I5432b7264652dd4485e2669f6004caa4f7459238
2021-11-26 13:13:25 +08:00
Lais Andrade
d2ac8488e4 Merge "Move APPLY_RAMPING_RINGER from Global to System" 2021-11-26 00:21:13 +00:00
Treehugger Robot
2c47b3f89e Merge "Hide emergency APN in user settings" am: 6c553c0c5c am: 90a326dc3c am: d36b37ab1c am: 2c42c7d4cd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1900491

Change-Id: I9343b70a19265b86568082d94adc009d421b5c5d
2021-11-25 11:39:18 +00:00
Treehugger Robot
2c42c7d4cd Merge "Hide emergency APN in user settings" am: 6c553c0c5c am: 90a326dc3c am: d36b37ab1c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1900491

Change-Id: I41943ab50d50986dd56c3eb89f474751b6cc14cf
2021-11-25 11:25:50 +00:00
Treehugger Robot
d36b37ab1c Merge "Hide emergency APN in user settings" am: 6c553c0c5c am: 90a326dc3c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1900491

Change-Id: I8ed9aa66573560824dac6c09295effecd7ee190d
2021-11-25 11:14:15 +00:00
Treehugger Robot
90a326dc3c Merge "Hide emergency APN in user settings" am: 6c553c0c5c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1900491

Change-Id: Id5f63157fc108b45a23a9a07572b719053945b7c
2021-11-25 10:57:05 +00:00
Bonian Chen
f74167b960 Merge "[Settings] Remove space before WiFiCalling description" 2021-11-25 10:08:57 +00:00
Treehugger Robot
6c553c0c5c Merge "Hide emergency APN in user settings" 2021-11-25 09:58:12 +00:00
Tsung-Mao Fang
f3890a1a15 Fix abnormal behavior on avatar account page am: 17423d1682 am: a58256be3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16327062

Change-Id: I43870e192fe3c85bae879a7f7e644400099af6d2
2021-11-25 04:51:18 +00:00
Tsung-Mao Fang
a58256be3d Fix abnormal behavior on avatar account page am: 17423d1682
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16327062

Change-Id: I2f6e3fe33969760c7639122df34901856dde27fb
2021-11-25 04:41:18 +00:00
Tsung-Mao Fang
17423d1682 Fix abnormal behavior on avatar account page
Prior to this cl, if user opens settings app
in single-pane first and navigates to
the avatar account page, then rotate the device,
user observed the account page was still shown
with full screen.

Because we didn't register correct split rule,
it causes the abormal behavior on two-pane mode.
In order to register correct rule,  we also need
to assign correct component name while opening the
account page.

Bug: 207609699
Test: Rebuilt apk and verify the behavior
Change-Id: I31def684c033c1d0c20870284826c6713a31b43d
2021-11-25 04:19:14 +00:00
Sergey Serokurov
69bf767960 Merge "Fix truncated string in bubbles setting screen" into sc-v2-dev am: 045983a6d2 am: 95405970bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16338885

Change-Id: I6c98c4f79416aded71898bc61cb45e82c0b8c018
2021-11-25 03:08:55 +00:00
Bonian Chen
144f295d7a [Settings] Move display of VPN version into summary text
Move the display of version text within VPN into summary part of the
display, and limit the height of summary area.

Bug: 205460459
Test: local
Change-Id: I666b9db356feeebf04e3be688897c2d9110a5275
2021-11-25 10:57:57 +08:00
Sergey Serokurov
95405970bb Merge "Fix truncated string in bubbles setting screen" into sc-v2-dev am: 045983a6d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16338885

Change-Id: I3bad5101201fff88d5580ad79e8c12ac1a5acd6d
2021-11-25 02:57:41 +00:00
Sergey Serokurov
045983a6d2 Merge "Fix truncated string in bubbles setting screen" into sc-v2-dev 2021-11-25 02:44:34 +00:00
Sergey Serokurov
258f5d8f26 Fix truncated string in bubbles setting screen
Bug: 187217715
Test: Manual, screenshot after the fix at https://screenshot.googleplex.com/4DjWc6AZTE6e75N
Change-Id: Ib683a9500cefed0d79192866e691257380a72a92
2021-11-24 16:17:31 -08:00
TreeHugger Robot
9eaf11e0c9 Merge "UI refinement of highlighted menu entry for large screen" into sc-v2-dev am: aee951dcb0 am: 517c9ead5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16304401

Change-Id: I21d8dab4ebc3292bf49a50e518531f3c07098a5b
2021-11-24 18:44:52 +00:00
TreeHugger Robot
517c9ead5e Merge "UI refinement of highlighted menu entry for large screen" into sc-v2-dev am: aee951dcb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16304401

Change-Id: I6da649fe2bf00d7630af90298c971928082092bb
2021-11-24 18:28:01 +00:00
Joe Bolinger
bf6a68f779 Merge "Prevent scrolling when interacting with confirm pattern prompt." into sc-v2-dev am: 710622d818 am: 89ac835d2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332073

Change-Id: Id9b8c3b32b8fac490da0708906304fb5ee49c904
2021-11-24 18:22:06 +00:00
TreeHugger Robot
aee951dcb0 Merge "UI refinement of highlighted menu entry for large screen" into sc-v2-dev 2021-11-24 18:16:37 +00:00
Joe Bolinger
89ac835d2e Merge "Prevent scrolling when interacting with confirm pattern prompt." into sc-v2-dev am: 710622d818
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332073

Change-Id: I2390634fede31fa796d4130f22e8cc3bd0da5ff9
2021-11-24 18:03:22 +00:00
Joe Bolinger
710622d818 Merge "Prevent scrolling when interacting with confirm pattern prompt." into sc-v2-dev 2021-11-24 17:48:07 +00:00
Mattias Nilsson
6a56b4a8e6 Hide emergency APN in user settings
Emergency APN types is not something for the end user
and should not be possible to edit.

Test: Add an emergency APN and check in Settings
Bug: 207626003
Change-Id: I866eb98dce410218bc76ade3201a2a2abfc959e7
2021-11-24 16:43:42 +01:00
TreeHugger Robot
ecf408bb24 Merge "Fix talkback issue on Subsettings" into sc-v2-dev am: 9928e585a6 am: ed0b68a71b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16324223

Change-Id: Ia926bc8909ffcda7bb9cbbaa000cda296558b037
2021-11-24 10:18:03 +00:00
TreeHugger Robot
ed0b68a71b Merge "Fix talkback issue on Subsettings" into sc-v2-dev am: 9928e585a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16324223

Change-Id: I499c652bcad2b4969e7896f5746012e4b2466e04
2021-11-24 10:06:52 +00:00
TreeHugger Robot
9928e585a6 Merge "Fix talkback issue on Subsettings" into sc-v2-dev 2021-11-24 09:54:34 +00:00
Bonian Chen
3f3c199dff Merge "[Settings] Remove the capital of 2nd wording" 2021-11-24 05:02:34 +00:00
Jason Chang
2c66e6429e Merge "(2) Update new intent action ACTION_ONE_HANDED_SETTINGS in Settings AndroidManifest to support long-pressed action for One-handed mode tile" 2021-11-24 00:24:14 +00:00