am 4044d6cd: Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev

* commit '4044d6cdd6309e06377ae57a4b941f2db87d6942':
  Fix display of "Contact sharing" option in Car kit for BT Settings.
This commit is contained in:
Sanket Padawe
2015-06-23 00:43:57 +00:00
committed by Android Git Automerger
2 changed files with 2 additions and 10 deletions

View File

@@ -53,6 +53,7 @@
<LinearLayout
android:id="@+id/profiles_section"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

View File

@@ -154,6 +154,7 @@ public final class DeviceProfilesSettings extends DialogFragment implements
dismiss();
return;
}
addPreferencesForProfiles();
refresh();
}
}
@@ -169,16 +170,6 @@ public final class DeviceProfilesSettings extends DialogFragment implements
mManager.setForegroundActivity(null);
}
public void setDevice(CachedBluetoothDevice cachedDevice) {
mCachedDevice = cachedDevice;
if (isResumed()) {
mCachedDevice.registerCallback(this);
addPreferencesForProfiles();
refresh();
}
}
private void addPreferencesForProfiles() {
mProfileContainer.removeAllViews();
for (LocalBluetoothProfile profile : mCachedDevice.getConnectableProfiles()) {