c24a09e593f8ef9407c4119080000cb20af4ad30
* For fix the "Automatic merge failed" in pi-dev, cherry pick the ag/4036738 in master. Change android.support.* to androidx.* * Add AdvancedConnectedDeviceController that used to show which component is available * Add getConnectedDevices Summary Resource Id() to decide which string should be shown. Here have 4 cases to shown the string. case 1: driving mode available and NFC is availalbe, show "Bluetooth, driving mode, NFC" case 2: driving mode available and NFC is not availalbe, show "Bluetooth, driving mode" case 3: driving mode not available and NFC is availalbe, show "Bluetooth, NFC" case 4: driving mode not available and NFC not availalbe, show "Bluetooth" * Add test to verify the summary string is correct in each condition * Add test to verify getAvailabilityStatus() is AVAILABLE. Bug: 79299421 Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedConnectedDeviceControllerTest Change-Id: I1048355bbd344db3ab645dd1537b4259eff57f38
Merge "Setting should handle android.settings.SYNC_SETTINGS from managed profile" into pi-dev am:
ef088843ae
Description
No description provided
Languages
Java
89.8%
Kotlin
10.2%