Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev (4044d6cd) · Commits · e / os / android_packages_apps_Settings

res/layout/device_profiles_settings.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@

		<LinearLayout
		android:id="@+id/profiles_section"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />

+1 −10

Original line number	Diff line number	Diff line
		@@ -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()) {