Merge "Make headset icons consistent before / after pairing" am: 690bdb22c9 (60eb5503) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/bluetooth/BluetoothDevicePreference.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -286,12 +286,12 @@ public final class BluetoothDevicePreference extends Preference implements
	}		}
	}		}
	if (btClass != null) {		if (btClass != null) {
	if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {
	return new Pair<Integer, String>(R.drawable.ic_bt_headphones_a2dp, HEADPHONE);
	}
	if (btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {		if (btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {
	return new Pair<Integer, String>(R.drawable.ic_bt_headset_hfp, HEADSET);		return new Pair<Integer, String>(R.drawable.ic_bt_headset_hfp, HEADSET);
	}		}
			if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {
			return new Pair<Integer, String>(R.drawable.ic_bt_headphones_a2dp, HEADPHONE);
			}
	}		}
	return new Pair<Integer, String>(R.drawable.ic_settings_bluetooth, BLUETOOTH);		return new Pair<Integer, String>(R.drawable.ic_settings_bluetooth, BLUETOOTH);
	}		}