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

Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24

Browse Source 
am: ef0e290e65

Change-Id: I77ca5052477a9e1efee01c7022378164096669b8
This commit is contained in:
Fan Zhang
2017-07-22 00:32:48 +00:00
committed by android-build-merger
parent c857c195cf ef0e290e65
commit 715f0956f4
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
View File

@@ -24,10 +24,8 @@ import android.content.IntentFilter;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.BidiFormatter;
import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import android.util.Log;
import com.android.settings.R;
@@ -49,7 +47,6 @@ public class BluetoothDeviceNamePreferenceController extends AbstractPreferenceC
public static final String KEY_DEVICE_NAME = "device_name";
private final int mAccentColor;
@VisibleForTesting
Preference mPreference;
@@ -71,7 +68,6 @@ public class BluetoothDeviceNamePreferenceController extends AbstractPreferenceC
@VisibleForTesting
BluetoothDeviceNamePreferenceController(Context context, LocalBluetoothAdapter localAdapter) {
super(context);
mAccentColor = com.android.settingslib.Utils.getColorAccent(context);
mLocalAdapter = localAdapter;
}
@@ -134,12 +130,10 @@ public class BluetoothDeviceNamePreferenceController extends AbstractPreferenceC
// TODO: show error message in preference subtitle
return;
}
final Spannable spannableName = new SpannableString(deviceName);
spannableName.setSpan(new ForegroundColorSpan(mAccentColor), 0,
spannableName.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
final CharSequence summary = TextUtils.expandTemplate(
mContext.getText(R.string.bluetooth_device_name_summary), spannableName);
mContext.getText(R.string.bluetooth_device_name_summary),
BidiFormatter.getInstance().unicodeWrap(deviceName));
preference.setSelectable(false);
preference.setSummary(summary);
}