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

Display "Android Auto" in Connected Devices summary text.

Browse Source 
Android Auto will be exposing a Settings tile under Connected Devices -> Connection Preferences.
If the Setting tile is available, then the summary text will reflect that.

Tested with additional unit tests and manually validated the scenarios by
flashing crosshatch-eng and disabling/enabling the relevant features.

Fix: 153896447
Test: Added unit coverage for new scenarios
Test: make RunSettingsRoboTests
Test: manually verified by flashing crosshatch-eng and disabling/enabling relevant components
Change-Id: I5a129c41b98ba435bc159a72c9a7c2dfd646ecd3
This commit is contained in:
Kevin Maurin
2020-04-22 13:53:55 -07:00
parent cb8be1de6f
commit cabe76debc
3 changed files with 144 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
View File

@@ -23,9 +23,15 @@ import static org.mockito.Mockito.spy;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
import android.content.pm.ResolveInfo;
import android.nfc.NfcAdapter;
import android.provider.Settings;
import androidx.test.core.content.pm.ApplicationInfoBuilder;
import com.android.settings.R;
import com.android.settings.nfc.NfcPreferenceController;
@@ -38,6 +44,7 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowNfcAdapter;
import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
@@ -47,11 +54,13 @@ public class AdvancedConnectedDeviceControllerTest {
private static final String KEY = "test_key";
private static final String 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 NfcPreferenceController mNfcController;
private ShadowNfcAdapter mShadowNfcAdapter;
private ContentResolver mContentResolver;
private ShadowPackageManager mShadowPackageManager;
@Before
public void setUp() {
@@ -62,6 +71,7 @@ public class AdvancedConnectedDeviceControllerTest {
mNfcController = new NfcPreferenceController(mContext,
NfcPreferenceController.KEY_TOGGLE_NFC);
mShadowNfcAdapter = Shadows.shadowOf(NfcAdapter.getNfcAdapter(mContext));
mShadowPackageManager = Shadows.shadowOf(mContext.getPackageManager());
}
@Test
@@ -76,14 +86,41 @@ public class AdvancedConnectedDeviceControllerTest {
public void isDrivingModeAvailable_returnTrue() {
Settings.System.putInt(mContentResolver, DRIVING_MODE_SETTINGS_ENABLED, 1);
assertThat(AdvancedConnectedDeviceController.isDrivingModeAvailable(mContext)).isTrue();
assertThat(
AdvancedConnectedDeviceController.isDrivingModeAvailable(mContext)).isTrue();
}
@Test
public void isDrivingModeAvailable_returnFalse() {
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 ApplicationInfo appInfo =
ApplicationInfoBuilder.newBuilder().setPackageName(ANDROID_AUTO_PACKAGE).build();
final ActivityInfo activityInfo = new ActivityInfo();
activityInfo.packageName = ANDROID_AUTO_PACKAGE;
activityInfo.name = ANDROID_AUTO_PACKAGE;
activityInfo.applicationInfo = appInfo;
final ResolveInfo resolveInfo = new ResolveInfo();
resolveInfo.activityInfo = activityInfo;
mShadowPackageManager.addResolveInfoForIntent(
buildAndroidAutoSettingsIntent(),
resolveInfo);
assertThat(
AdvancedConnectedDeviceController.isAndroidAutoSettingAvailable(mContext)).isTrue();
}
@Test
public void isAndroidAutoSettingAvailable_returnFalse() {
// No ResolveInfo for Android Auto, expect false.
assertThat(
AdvancedConnectedDeviceController.isAndroidAutoSettingAvailable(mContext)).isFalse();
}
@Test
@@ -91,7 +128,7 @@ public class AdvancedConnectedDeviceControllerTest {
// NFC available, driving mode available
mShadowNfcAdapter.setEnabled(true);
assertThat(AdvancedConnectedDeviceController
.getConnectedDevicesSummaryResourceId(mNfcController, true))
.getConnectedDevicesSummaryResourceId(mNfcController, true, false))
.isEqualTo(R.string.connected_devices_dashboard_summary);
}
@@ -100,7 +137,7 @@ public class AdvancedConnectedDeviceControllerTest {
// NFC is available, driving mode not available
mShadowNfcAdapter.setEnabled(true);
assertThat(AdvancedConnectedDeviceController
.getConnectedDevicesSummaryResourceId(mNfcController, false))
.getConnectedDevicesSummaryResourceId(mNfcController, false, false))
.isEqualTo(R.string.connected_devices_dashboard_no_driving_mode_summary);
}
@@ -109,7 +146,7 @@ public class AdvancedConnectedDeviceControllerTest {
// NFC not available, driving mode available
ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null);
assertThat(AdvancedConnectedDeviceController
.getConnectedDevicesSummaryResourceId(mNfcController, true))
.getConnectedDevicesSummaryResourceId(mNfcController, true, false))
.isEqualTo(R.string.connected_devices_dashboard_no_nfc_summary);
}
@@ -118,7 +155,52 @@ public class AdvancedConnectedDeviceControllerTest {
// NFC not available, driving mode not available
ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null);
assertThat(AdvancedConnectedDeviceController
.getConnectedDevicesSummaryResourceId(mNfcController, false))
.getConnectedDevicesSummaryResourceId(mNfcController, false, false))
.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;
}
}