diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-06-23 00:34:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 00:34:37 +0000 |
| commit | 4044d6cdd6309e06377ae57a4b941f2db87d6942 (patch) | |
| tree | 6555a66f06821d824ba4531ed39235adf467a744 | |
| parent | d55ddc337edd7236a7024602b7970e146f9489db (diff) | |
| parent | 53e74f510be255b00d06da44f8a91c61608ffade (diff) | |
| download | packages_apps_Settings-4044d6cdd6309e06377ae57a4b941f2db87d6942.zip packages_apps_Settings-4044d6cdd6309e06377ae57a4b941f2db87d6942.tar.gz packages_apps_Settings-4044d6cdd6309e06377ae57a4b941f2db87d6942.tar.bz2 | |
Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev
| -rw-r--r-- | res/layout/device_profiles_settings.xml | 1 | ||||
| -rwxr-xr-x | src/com/android/settings/bluetooth/DeviceProfilesSettings.java | 11 |
2 files changed, 2 insertions, 10 deletions
diff --git a/res/layout/device_profiles_settings.xml b/res/layout/device_profiles_settings.xml index 0f84385..87b8500 100644 --- a/res/layout/device_profiles_settings.xml +++ b/res/layout/device_profiles_settings.xml @@ -53,6 +53,7 @@ <LinearLayout android:id="@+id/profiles_section" + android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java index 5dd7098..ae42e3d 100755 --- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java +++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java @@ -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()) { |