summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
diff options
context:
space:
mode:
authorAndrew Sapperstein <asapperstein@google.com>2017-06-26 14:21:19 -0700
committerAndrew Sapperstein <asapperstein@google.com>2017-06-26 14:28:10 -0700
commitc0d544943fd06eb55445c5b1aba4914dce0f5907 (patch)
treeac74ba5bf7c02a423a4d48f801094ad9dcdb42b1 /src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
parentc26ae0677ed209e17af5b63235ddcd5f1d0fd183 (diff)
parente414cd231656314442cb503f9cda3677561dc44a (diff)
downloadpackages_apps_Settings-c0d544943fd06eb55445c5b1aba4914dce0f5907.tar.gz
packages_apps_Settings-c0d544943fd06eb55445c5b1aba4914dce0f5907.tar.bz2
packages_apps_Settings-c0d544943fd06eb55445c5b1aba4914dce0f5907.zip
Merge commit 'e414cd231656314442cb503f9cda3677561dc44a' into manual_merge_e414cd2316
Test: none Change-Id: I5dedcc30c9f15fa61532ecad2e0f68de4fd97c8e
Diffstat (limited to 'src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java')
-rw-r--r--src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
index 5c521dd7e8..dfbda1f22d 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
@@ -111,7 +111,8 @@ public class BluetoothDeviceNamePreferenceController extends AbstractPreferenceC
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (KEY_DEVICE_NAME.equals(preference.getKey())) {
- new BluetoothNameDialogFragment().show(mFragment.getFragmentManager(), "rename device");
+ LocalDeviceNameDialogFragment.newInstance()
+ .show(mFragment.getFragmentManager(), LocalDeviceNameDialogFragment.TAG);
return true;
}