PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Display "Android Auto" in Connected Devices summary text."

Browse Source 
This reverts commit 6fb790b092.

Reason for revert: This CL causes test failures. Per Settings convention, revert the CL first.

Bug: 155829041
Change-Id: I486e09b63c9999b56d4359a7ec211fe8a6c89181
This commit is contained in:
Yi-Ling Chuang
2020-05-06 03:19:12 +00:00
parent 6fb790b092
commit 8258eb0327
3 changed files with 19 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java
View File

@@ -15,10 +15,7 @@
*/
package com.android.settings.connecteddevice;
import static com.android.settingslib.drawer.TileUtils.IA_SETTINGS_ACTION;
import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
@@ -34,7 +31,6 @@ public class AdvancedConnectedDeviceController extends BasePreferenceController
private static final String DRIVING_MODE_SETTINGS_ENABLED =
"gearhead:driving_mode_settings_enabled";
private static final String GEARHEAD_PACKAGE = "com.google.android.projection.gearhead";
public AdvancedConnectedDeviceController(Context context, String preferenceKey) {
super(context, preferenceKey);
@@ -59,7 +55,7 @@ public class AdvancedConnectedDeviceController extends BasePreferenceController
new NfcPreferenceController(context, NfcPreferenceController.KEY_TOGGLE_NFC);
return getConnectedDevicesSummaryResourceId(nfcPreferenceController,
isDrivingModeAvailable(context), isAndroidAutoSettingAvailable(context));
isDrivingModeAvailable(context));
}
@VisibleForTesting
@@ -68,57 +64,26 @@ public class AdvancedConnectedDeviceController extends BasePreferenceController
getInt(context.getContentResolver(), DRIVING_MODE_SETTINGS_ENABLED, 0) == 1;
}
@VisibleForTesting
static boolean isAndroidAutoSettingAvailable(Context context) {
final Intent intent = new Intent(IA_SETTINGS_ACTION);
intent.setPackage(GEARHEAD_PACKAGE);
return intent.resolveActivity(context.getPackageManager()) != null;
}
@VisibleForTesting
static int getConnectedDevicesSummaryResourceId(NfcPreferenceController
nfcPreferenceController,
boolean isDrivingModeAvailable,
boolean isAndroidAutoAvailable) {
nfcPreferenceController, boolean isDrivingModeAvailable) {
final int resId;
if (isAndroidAutoAvailable) {
if (nfcPreferenceController.isAvailable()) {
if (isDrivingModeAvailable) {
// NFC available, driving mode available
resId = R.string.connected_devices_dashboard_android_auto_summary;
} else {
// NFC available, driving mode not available
resId =
R.string.connected_devices_dashboard_android_auto_no_driving_mode_summary;
}
if (nfcPreferenceController.isAvailable()) {
if (isDrivingModeAvailable) {
// NFC available, driving mode available
resId = R.string.connected_devices_dashboard_summary;
} else {
if (isDrivingModeAvailable) {
// NFC not available, driving mode available
resId = R.string.connected_devices_dashboard_android_auto_no_nfc_summary;
} else {
// NFC not available, driving mode not available
resId =
R.string.connected_devices_dashboard_android_auto_no_nfc_no_driving_mode;
}
// NFC available, driving mode not available
resId = R.string.connected_devices_dashboard_no_driving_mode_summary;
}
} else {
if (nfcPreferenceController.isAvailable()) {
if (isDrivingModeAvailable) {
// NFC available, driving mode available
resId = R.string.connected_devices_dashboard_summary;
} else {
// NFC available, driving mode not available
resId = R.string.connected_devices_dashboard_no_driving_mode_summary;
}
if (isDrivingModeAvailable) {
// NFC not available, driving mode available
resId = R.string.connected_devices_dashboard_no_nfc_summary;
} else {
if (isDrivingModeAvailable) {
// NFC not available, driving mode available
resId = R.string.connected_devices_dashboard_no_nfc_summary;
} else {
// NFC not available, driving mode not available
resId = R.string.connected_devices_dashboard_no_driving_mode_no_nfc_summary;
}
// NFC not available, driving mode not available
resId = R.string.connected_devices_dashboard_no_driving_mode_no_nfc_summary;
}
}