Skip to content

Commit 0bb15d5

Browse files
muhomorrthestinger
authored andcommitted
remove confusing mention of Android Auto from "Connected devices" screen
1 parent ecf5a13 commit 0bb15d5

File tree

2 files changed

+1
-34
lines changed

2 files changed

+1
-34
lines changed

src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ public class AdvancedConnectedDeviceController extends BasePreferenceController
3434

3535
private static final String DRIVING_MODE_SETTINGS_ENABLED =
3636
"gearhead:driving_mode_settings_enabled";
37-
private static final String GEARHEAD_PACKAGE = "com.google.android.projection.gearhead";
3837

3938
public AdvancedConnectedDeviceController(Context context, String preferenceKey) {
4039
super(context, preferenceKey);
@@ -59,7 +58,7 @@ public static int getConnectedDevicesSummaryResourceId(Context context) {
5958
new NfcPreferenceController(context, NfcPreferenceController.KEY_TOGGLE_NFC);
6059

6160
return getConnectedDevicesSummaryResourceId(nfcPreferenceController,
62-
isDrivingModeAvailable(context), isAndroidAutoSettingAvailable(context));
61+
isDrivingModeAvailable(context), false);
6362
}
6463

6564
@VisibleForTesting
@@ -68,13 +67,6 @@ static boolean isDrivingModeAvailable(Context context) {
6867
getInt(context.getContentResolver(), DRIVING_MODE_SETTINGS_ENABLED, 0) == 1;
6968
}
7069

71-
@VisibleForTesting
72-
static boolean isAndroidAutoSettingAvailable(Context context) {
73-
final Intent intent = new Intent(IA_SETTINGS_ACTION);
74-
intent.setPackage(GEARHEAD_PACKAGE);
75-
return intent.resolveActivity(context.getPackageManager()) != null;
76-
}
77-
7870
@VisibleForTesting
7971
static int getConnectedDevicesSummaryResourceId(NfcPreferenceController
8072
nfcPreferenceController,

tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -99,31 +99,6 @@ public void isDrivingModeAvailable_returnFalse() {
9999
AdvancedConnectedDeviceController.isDrivingModeAvailable(mContext)).isFalse();
100100
}
101101

102-
@Test
103-
public void isAndroidAutoSettingAvailable_returnTrue() {
104-
final ApplicationInfo appInfo =
105-
ApplicationInfoBuilder.newBuilder().setPackageName(ANDROID_AUTO_PACKAGE).build();
106-
final ActivityInfo activityInfo = new ActivityInfo();
107-
activityInfo.packageName = ANDROID_AUTO_PACKAGE;
108-
activityInfo.name = ANDROID_AUTO_PACKAGE;
109-
activityInfo.applicationInfo = appInfo;
110-
final ResolveInfo resolveInfo = new ResolveInfo();
111-
resolveInfo.activityInfo = activityInfo;
112-
mShadowPackageManager.addResolveInfoForIntent(
113-
buildAndroidAutoSettingsIntent(),
114-
resolveInfo);
115-
116-
assertThat(
117-
AdvancedConnectedDeviceController.isAndroidAutoSettingAvailable(mContext)).isTrue();
118-
}
119-
120-
@Test
121-
public void isAndroidAutoSettingAvailable_returnFalse() {
122-
// No ResolveInfo for Android Auto, expect false.
123-
assertThat(
124-
AdvancedConnectedDeviceController.isAndroidAutoSettingAvailable(mContext)).isFalse();
125-
}
126-
127102
@Test
128103
public void getConnectedDevicesSummaryResourceId_NFCAndDrivingModeAvailable() {
129104
// NFC available, driving mode available

0 commit comments

Comments
 (0)