packages-apps-Settings

Fork

Merge "Fix settings crash" into rvc-qpr-dev

Merge "Show just disconnected device on previously connected" into rvc-qpr-dev

Merge "Show all devices, including connected ones, into "Previously connected" page" into rvc-qpr-dev

Merge "[DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController" into rvc-qpr-dev

Merge "Display "pair new" only when local output device is available." into rvc-qpr-dev

Merge "Display "see all" option when bluetooth is off" into rvc-qpr-dev

[DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController

WifiConnectionPreferenceController only shows when there are 2 SIMs,
it shows the connected Wi-Fi network.

WifiConnectionPreferenceController does not use WifiPickerTracker
to get a WifiEntry key. It should not launch WifiNetworkDetailsFragment2
which uses a WifiEntry key to find a WifiEntry.

Bug: 168280554
Test: manual
1. Make MultiNetworkHeaderController available.
2. Settings -> Network & internet -> click connected Wi-Fi
3. See Wi-Fi Details
Change-Id: I2acea3564d2d89fe8e120064b33ef342c97edb60

Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ic5e9637ae3803ba74454583f4425cef0f5abcd62

Merge "[Wi-Fi] Show Pie+x Wi-Fi icon when a connected Wi-Fi is not default route" into rvc-qpr-dev

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0770b54a6b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0f3a1ce32ce46d006902ee3108ff7db8022297ba

Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I0e7a6b9b829341cbcdf6bace5cb813c6a182f12d

Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I713058fc16146fcb8c3ec66cfccaf7c736981a4e

Update state when there is Bluetooth tethering state changed

Monitor Bluetooth Tethering state and update preference when there is
Bluetooth tethering state change.
Add test case to verify when recieve
BluetoothPan.TETHERING_STATE_CHANGED will update bluetooth state

Bug: 138688805
Test: make RunSettingsRoboTests
Merged-Id: I8f468d1d99ed6d87f6cd8305ef56b0d7a5dec95b
Change-Id: I8f468d1d99ed6d87f6cd8305ef56b0d7a5dec95b

Add permission to protect data when sending broadcast

This CL before, DevicePickerFragment didn't check the
whether 3rd-party app have Bluetooth permission before
sending broadcast. It's will cause the 3rd-party app can
get Bluetooth device information without request permission.

This CL will send broadcast with Bluetooth permission that
make sure the receiver who have Bluetooth permission can get
this Bluetooth device infomation.

Bug: 161716630
Test: verify on test apk to confirm that not showing mac address.
Change-Id: I6662dc38b3491e5ee467058dd74863ecac27cdd7

Snap for 6824415 from 94d3a30bcf613964bac2cc630d307c2ad2dc62eb to rvc-d2-release

Change-Id: I22426cb22507907d4c4b3bc748a9c392f2d3da5c

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iddec8911b06b8da1cf5244c44e505139a48d8453

Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I9cb199fccd6af58b074819d1fdd3d2404fcddfc9

Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I7bc2aaf9e23573eb179950feb6edb427877f0c3f

Prevent overlay drawing on top of Bluetooth discovery request dialog

Bug: 155650356
Change-Id: I9cee6e5bb8cef77aa385d664fe0738db1496ef20
Merged-In: I9cee6e5bb8cef77aa385d664fe0738db1496ef20
(cherry picked from commit ac671004231fb2ceb85f3101995e22dcc52c8088)

Prevent overlay drawing on top of Bluetooth pairing dialog

Bug: 155648639
Change-Id: I99643ee9084f3a9bc1ad9a459ac27c587d832c91
Merged-In: I99643ee9084f3a9bc1ad9a459ac27c587d832c91
(cherry picked from commit 3f5bf02fd8b72a57052fefccf90d0f42ab8ab5e0)

Fix settings crash

- This CL before, "Previously connected device" didn't
handle dock device. If user have disconnected dock
device will cause Settings crash.

This CL add condition to handle dock device to avoid crash.
- Update test case.

Bug: 157653997
Bug: 167054620
Test: make -j42 RunSettingsRoboTests
Change-Id: I769cee3f589e14a993b00a0ae6ec3ddfba8ef281
Merged-In: I769cee3f589e14a993b00a0ae6ec3ddfba8ef281

Show just disconnected device on previously connected

- This CL before, previously connected devices will show most
recently connected devices and the maximum is 3.
In this time, if next most recently connected device is disconnected.
It's will not show on "previously connected devices", user needs go to
"see all" page to found that device.
This CL add rule to compare the priority of most recently connected
device. If priority of next disconnected device is higher than
currnect devices that on "previously connected devices".
Let next disconnected device show on "previously connected devices".
- Update test case.

Bug: 157653997
Test: make -j42 RunSettingsRoboTests
Change-Id: I684501a20a67755b2196ba9d4b5565add01a5d01
Merged-In: I684501a20a67755b2196ba9d4b5565add01a5d01

Display "see all" option when bluetooth is off

- This CL before, Bluetooth settings will hide the "see all"
option when bluetooth is off. For the UX improvement, this
CL will show the "see all" button when bluetooth is off. And
turn on the BT when user press "see all" button to let user to
quick pair their disconnected devices.
- Update and add test case

Bug: 147150367
Test: make -j42 RunSettingsRoboTests
Change-Id: I7a1451a36a31253b6be2203341bea4e59fed7c2b
Merged-In: I7a1451a36a31253b6be2203341bea4e59fed7c2b
(cherry picked from commit bde100849ee30627e68ea355834f87bfa108d9fc)

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba -s ours

am skip reason: subject contains skip directive

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

Change-Id: I027479bbfa400ad6bb51b1a64d8b70e0dfb68800

Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Idf95416dc8ce50515dd6763c3ae24ebf89722c6a

Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I0eedcd75ce4aca6fffdd86fb7da8b177c01a9696

Show all devices, including connected ones, into "Previously connected" page

-Add connected devices in "Previously connected" page
-Set active when clicking a connected device

Bug: 147150246
Test: make -j50 RunSettingsRoboTests
Change-Id: I4422cd63c360a4387cedc4f80f34474b42f82a1f
(cherry picked from commit 9743fed57d8f1cbfe93027a819176c05f2c7acdb)

Display "pair new" only when local output device is available.

-If media app does not support cast->phone transferring, local output
audio device is unavailable. "pair new" is for Bluetooth which should be
also unavilable.
-These types are local output audio devices:
TYPE_BUILTIN_SPEAKER
TYPE_WIRED_HEADSET
TYPE_WIRED_HEADPHONES
TYPE_USB_DEVICE
TYPE_USB_HEADSET
TYPE_USB_ACCESSORY
TYPE_DOCK
TYPE_HDMI

Bug: 163095048
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib844c7546e1946cb87fac04cb8b2b8f4acf06451
(cherry picked from commit 113ac8102aa1db6a1d901e6acbd41ca8f9cb934d)

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09cc09a274 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id7673649ab84ae3507e9d55acdfff4d84661d901

Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Icde96a03193c5c91d61dd9354bc4c34d8b53e5be