Display "Android Auto" in Connected Devices summary text. am: 6fb790b092 am: 4d66ddb35d am: 3c8d70626c

Change-Id: I81c1674d896a05bc2990595a0b0a5227249ee0c9
This commit is contained in:
Kevin Maurin
2020-05-05 23:23:22 +00:00
committed by Automerger Merge Worker
3 changed files with 141 additions and 19 deletions

View File

@@ -7485,6 +7485,14 @@
<string name="connected_devices_dashboard_no_driving_mode_summary">Bluetooth, NFC</string> <string name="connected_devices_dashboard_no_driving_mode_summary">Bluetooth, NFC</string>
<!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]--> <!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary">Bluetooth</string> <string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary">Bluetooth</string>
<!--Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
<string name="connected_devices_dashboard_android_auto_summary">Bluetooth, Android Auto, driving mode, NFC</string><!--
Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
<string name="connected_devices_dashboard_android_auto_no_nfc_summary">Bluetooth, Android Auto, driving mode</string>
<!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
<string name="connected_devices_dashboard_android_auto_no_driving_mode_summary">Bluetooth, Android Auto, NFC</string>
<!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
<string name="connected_devices_dashboard_android_auto_no_nfc_no_driving_mode">Bluetooth, Android Auto</string>
<!-- Summary for Tap & pay settings, explaning a few important settings under it [CHAR LIMIT=NONE]--> <!-- Summary for Tap & pay settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
<string name="nfc_and_payment_settings_payment_off_nfc_off_summary">Unavailable because NFC is off</string> <string name="nfc_and_payment_settings_payment_off_nfc_off_summary">Unavailable because NFC is off</string>
<!-- Summary for Tap & pay settings, explaning a few important settings under it [CHAR LIMIT=NONE]--> <!-- Summary for Tap & pay settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->

View File

@@ -15,7 +15,10 @@
*/ */
package com.android.settings.connecteddevice; package com.android.settings.connecteddevice;
import static com.android.settingslib.drawer.TileUtils.IA_SETTINGS_ACTION;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.provider.Settings; import android.provider.Settings;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -31,6 +34,7 @@ public class AdvancedConnectedDeviceController extends BasePreferenceController
private static final String DRIVING_MODE_SETTINGS_ENABLED = private static final String DRIVING_MODE_SETTINGS_ENABLED =
"gearhead: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) { public AdvancedConnectedDeviceController(Context context, String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
@@ -55,7 +59,7 @@ public class AdvancedConnectedDeviceController extends BasePreferenceController
new NfcPreferenceController(context, NfcPreferenceController.KEY_TOGGLE_NFC); new NfcPreferenceController(context, NfcPreferenceController.KEY_TOGGLE_NFC);
return getConnectedDevicesSummaryResourceId(nfcPreferenceController, return getConnectedDevicesSummaryResourceId(nfcPreferenceController,
isDrivingModeAvailable(context)); isDrivingModeAvailable(context), isAndroidAutoSettingAvailable(context));
} }
@VisibleForTesting @VisibleForTesting
@@ -64,11 +68,41 @@ public class AdvancedConnectedDeviceController extends BasePreferenceController
getInt(context.getContentResolver(), DRIVING_MODE_SETTINGS_ENABLED, 0) == 1; 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 @VisibleForTesting
static int getConnectedDevicesSummaryResourceId(NfcPreferenceController static int getConnectedDevicesSummaryResourceId(NfcPreferenceController
nfcPreferenceController, boolean isDrivingModeAvailable) { nfcPreferenceController,
boolean isDrivingModeAvailable,
boolean isAndroidAutoAvailable) {
final int resId; 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;
}
} 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;
}
}
} else {
if (nfcPreferenceController.isAvailable()) { if (nfcPreferenceController.isAvailable()) {
if (isDrivingModeAvailable) { if (isDrivingModeAvailable) {
// NFC available, driving mode available // NFC available, driving mode available
@@ -86,6 +120,7 @@ public class AdvancedConnectedDeviceController extends BasePreferenceController
resId = R.string.connected_devices_dashboard_no_driving_mode_no_nfc_summary; resId = R.string.connected_devices_dashboard_no_driving_mode_no_nfc_summary;
} }
} }
}
return resId; return resId;
} }

View File

@@ -23,6 +23,9 @@ import static org.mockito.Mockito.spy;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ResolveInfo;
import android.nfc.NfcAdapter; import android.nfc.NfcAdapter;
import android.provider.Settings; import android.provider.Settings;
@@ -38,6 +41,7 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows; import org.robolectric.Shadows;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowNfcAdapter; import org.robolectric.shadows.ShadowNfcAdapter;
import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.util.ReflectionHelpers; import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@@ -47,11 +51,13 @@ public class AdvancedConnectedDeviceControllerTest {
private static final String KEY = "test_key"; private static final String KEY = "test_key";
private static final String DRIVING_MODE_SETTINGS_ENABLED = private static final String DRIVING_MODE_SETTINGS_ENABLED =
"gearhead:driving_mode_settings_enabled"; "gearhead:driving_mode_settings_enabled";
private static final String ANDROID_AUTO_PACKAGE = "com.google.android.projection.gearhead";
private Context mContext; private Context mContext;
private NfcPreferenceController mNfcController; private NfcPreferenceController mNfcController;
private ShadowNfcAdapter mShadowNfcAdapter; private ShadowNfcAdapter mShadowNfcAdapter;
private ContentResolver mContentResolver; private ContentResolver mContentResolver;
private ShadowPackageManager mShadowPackageManager;
@Before @Before
public void setUp() { public void setUp() {
@@ -62,6 +68,7 @@ public class AdvancedConnectedDeviceControllerTest {
mNfcController = new NfcPreferenceController(mContext, mNfcController = new NfcPreferenceController(mContext,
NfcPreferenceController.KEY_TOGGLE_NFC); NfcPreferenceController.KEY_TOGGLE_NFC);
mShadowNfcAdapter = Shadows.shadowOf(NfcAdapter.getNfcAdapter(mContext)); mShadowNfcAdapter = Shadows.shadowOf(NfcAdapter.getNfcAdapter(mContext));
mShadowPackageManager = Shadows.shadowOf(mContext.getPackageManager());
} }
@Test @Test
@@ -76,14 +83,41 @@ public class AdvancedConnectedDeviceControllerTest {
public void isDrivingModeAvailable_returnTrue() { public void isDrivingModeAvailable_returnTrue() {
Settings.System.putInt(mContentResolver, DRIVING_MODE_SETTINGS_ENABLED, 1); Settings.System.putInt(mContentResolver, DRIVING_MODE_SETTINGS_ENABLED, 1);
assertThat(AdvancedConnectedDeviceController.isDrivingModeAvailable(mContext)).isTrue(); assertThat(
AdvancedConnectedDeviceController.isDrivingModeAvailable(mContext)).isTrue();
} }
@Test @Test
public void isDrivingModeAvailable_returnFalse() { public void isDrivingModeAvailable_returnFalse() {
Settings.System.putInt(mContentResolver, DRIVING_MODE_SETTINGS_ENABLED, 0); Settings.System.putInt(mContentResolver, DRIVING_MODE_SETTINGS_ENABLED, 0);
assertThat(AdvancedConnectedDeviceController.isDrivingModeAvailable(mContext)).isFalse(); assertThat(
AdvancedConnectedDeviceController.isDrivingModeAvailable(mContext)).isFalse();
}
@Test
public void isAndroidAutoSettingAvailable_returnTrue() {
final ActivityInfo activityInfo = new ActivityInfo();
activityInfo.packageName = ANDROID_AUTO_PACKAGE;
final ResolveInfo resolveInfo = new ResolveInfo();
resolveInfo.activityInfo = activityInfo;
mShadowPackageManager.addResolveInfoForIntent(
buildAndroidAutoSettingsIntent(),
resolveInfo);
assertThat(
AdvancedConnectedDeviceController.isAndroidAutoSettingAvailable(mContext)).isTrue();
}
@Test
public void isAndroidAutoSettingAvailable_returnFalse() {
ResolveInfo resolveInfo = null; // Needed to disambiguate method
mShadowPackageManager.addResolveInfoForIntent(
buildAndroidAutoSettingsIntent(),
resolveInfo);
assertThat(
AdvancedConnectedDeviceController.isAndroidAutoSettingAvailable(mContext)).isFalse();
} }
@Test @Test
@@ -91,7 +125,7 @@ public class AdvancedConnectedDeviceControllerTest {
// NFC available, driving mode available // NFC available, driving mode available
mShadowNfcAdapter.setEnabled(true); mShadowNfcAdapter.setEnabled(true);
assertThat(AdvancedConnectedDeviceController assertThat(AdvancedConnectedDeviceController
.getConnectedDevicesSummaryResourceId(mNfcController, true)) .getConnectedDevicesSummaryResourceId(mNfcController, true, false))
.isEqualTo(R.string.connected_devices_dashboard_summary); .isEqualTo(R.string.connected_devices_dashboard_summary);
} }
@@ -100,7 +134,7 @@ public class AdvancedConnectedDeviceControllerTest {
// NFC is available, driving mode not available // NFC is available, driving mode not available
mShadowNfcAdapter.setEnabled(true); mShadowNfcAdapter.setEnabled(true);
assertThat(AdvancedConnectedDeviceController assertThat(AdvancedConnectedDeviceController
.getConnectedDevicesSummaryResourceId(mNfcController, false)) .getConnectedDevicesSummaryResourceId(mNfcController, false, false))
.isEqualTo(R.string.connected_devices_dashboard_no_driving_mode_summary); .isEqualTo(R.string.connected_devices_dashboard_no_driving_mode_summary);
} }
@@ -109,7 +143,7 @@ public class AdvancedConnectedDeviceControllerTest {
// NFC not available, driving mode available // NFC not available, driving mode available
ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null); ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null);
assertThat(AdvancedConnectedDeviceController assertThat(AdvancedConnectedDeviceController
.getConnectedDevicesSummaryResourceId(mNfcController, true)) .getConnectedDevicesSummaryResourceId(mNfcController, true, false))
.isEqualTo(R.string.connected_devices_dashboard_no_nfc_summary); .isEqualTo(R.string.connected_devices_dashboard_no_nfc_summary);
} }
@@ -118,7 +152,52 @@ public class AdvancedConnectedDeviceControllerTest {
// NFC not available, driving mode not available // NFC not available, driving mode not available
ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null); ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null);
assertThat(AdvancedConnectedDeviceController assertThat(AdvancedConnectedDeviceController
.getConnectedDevicesSummaryResourceId(mNfcController, false)) .getConnectedDevicesSummaryResourceId(mNfcController, false, false))
.isEqualTo(R.string.connected_devices_dashboard_no_driving_mode_no_nfc_summary); .isEqualTo(R.string.connected_devices_dashboard_no_driving_mode_no_nfc_summary);
} }
@Test
public void getConnectedDevicesSummaryResourceId_Auto_NFC_DrivingMode_Available() {
// NFC available, driving mode available
mShadowNfcAdapter.setEnabled(true);
assertThat(AdvancedConnectedDeviceController
.getConnectedDevicesSummaryResourceId(mNfcController, true, true))
.isEqualTo(R.string.connected_devices_dashboard_android_auto_summary);
}
@Test
public void getConnectedDevicesSummaryResourceId_Auto_NFC_Available() {
// NFC is available, driving mode not available
mShadowNfcAdapter.setEnabled(true);
assertThat(AdvancedConnectedDeviceController
.getConnectedDevicesSummaryResourceId(mNfcController, false, true))
.isEqualTo(
R.string.connected_devices_dashboard_android_auto_no_driving_mode_summary);
}
@Test
public void getConnectedDevicesSummaryResourceId_Auto_DrivingMode_Available() {
// NFC not available, driving mode available
ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null);
assertThat(AdvancedConnectedDeviceController
.getConnectedDevicesSummaryResourceId(mNfcController, true, true))
.isEqualTo(R.string.connected_devices_dashboard_android_auto_no_nfc_summary);
}
@Test
public void getConnectedDevicesSummaryResourceId_Auto_Available() {
// NFC not available, driving mode not available
ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null);
assertThat(AdvancedConnectedDeviceController
.getConnectedDevicesSummaryResourceId(mNfcController, false, true))
.isEqualTo(
R.string.connected_devices_dashboard_android_auto_no_nfc_no_driving_mode);
}
private Intent buildAndroidAutoSettingsIntent() {
final Intent intent = new Intent("com.android.settings.action.IA_SETTINGS");
intent.setPackage(ANDROID_AUTO_PACKAGE);
return intent;
}
} }