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

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

Browse Source 
* commit 'a8c6cb5a72974118adb7f39acb3a906a63541dac':
  Fix display of "Contact sharing" option in Car kit for BT Settings.
This commit is contained in:
Sanket Padawe
2015-06-23 03:20:29 +00:00
committed by Android Git Automerger
parent 30552566f7 a8c6cb5a72
commit bf4849c8bb
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/device_profiles_settings.xml
View File

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

11
src/com/android/settings/bluetooth/DeviceProfilesSettings.java
View File

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