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

BidiFormat adapter name for bluetooth_is_visible_message

Browse Source 
am: 77893a4c4b

Change-Id: I2df1050e9b9cb20e369fca56e3e457a3cf2a0397
This commit is contained in:
Roozbeh Pournader
2016-06-16 01:59:37 +00:00
committed by android-build-merger
parent 3d040e55d9 77893a4c4b
commit 7d9cdfd4b6
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/bluetooth/BluetoothSettings.java
View File

@@ -31,6 +31,7 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory; import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceGroup; import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.PreferenceScreen;
import android.text.BidiFormatter;
import android.text.Spannable; import android.text.Spannable;
import android.text.style.TextAppearanceSpan; import android.text.style.TextAppearanceSpan;
import android.util.Log; import android.util.Log;
@@ -57,6 +58,7 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Set; import java.util.Set;
import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
@@ -115,8 +117,12 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
private void updateDeviceName(Context context) { private void updateDeviceName(Context context) {
if (mLocalAdapter.isEnabled() && mMyDevicePreference != null) { if (mLocalAdapter.isEnabled() && mMyDevicePreference != null) {
mMyDevicePreference.setSummary(context.getResources().getString( final Resources res = context.getResources();
R.string.bluetooth_is_visible_message, mLocalAdapter.getName())); final Locale locale = res.getConfiguration().getLocales().get(0);
final BidiFormatter bidiFormatter = BidiFormatter.getInstance(locale);
mMyDevicePreference.setSummary(res.getString(
R.string.bluetooth_is_visible_message,
bidiFormatter.unicodeWrap(mLocalAdapter.getName())));
} }
} }
}; };
@@ -345,8 +351,12 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
startScanning(); startScanning();
} }
mMyDevicePreference.setSummary(getResources().getString( final Resources res = getResources();
R.string.bluetooth_is_visible_message, mLocalAdapter.getName())); final Locale locale = res.getConfiguration().getLocales().get(0);
final BidiFormatter bidiFormatter = BidiFormatter.getInstance(locale);
mMyDevicePreference.setSummary(res.getString(
R.string.bluetooth_is_visible_message,
bidiFormatter.unicodeWrap(mLocalAdapter.getName())));
getActivity().invalidateOptionsMenu(); getActivity().invalidateOptionsMenu();