Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
diff --git a/res/values/bools.xml b/res/values/bools.xml
index ffbc863..15706df 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -41,9 +41,6 @@
<!-- Whether none security option is hide or not (country specific). -->
<bool name="config_hide_none_security_option">false</bool>
- <!--Whether the storage manager exists. -->
- <bool name="config_has_storage_manager">false</bool>
-
<!-- Whether the automatic storage management job should be scheduled. -->
<bool name="enable_automatic_storage_management">false</bool>
</resources>
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index cc46fba..ba3336e 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -31,6 +31,7 @@
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen;
+import android.text.BidiFormatter;
import android.text.Spannable;
import android.text.style.TextAppearanceSpan;
import android.util.Log;
@@ -57,6 +58,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
import java.util.Set;
import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
@@ -115,8 +117,12 @@
private void updateDeviceName(Context context) {
if (mLocalAdapter.isEnabled() && mMyDevicePreference != null) {
- mMyDevicePreference.setSummary(context.getResources().getString(
- R.string.bluetooth_is_visible_message, mLocalAdapter.getName()));
+ final Resources res = context.getResources();
+ 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 @@
startScanning();
}
- mMyDevicePreference.setSummary(getResources().getString(
- R.string.bluetooth_is_visible_message, mLocalAdapter.getName()));
+ final Resources res = getResources();
+ 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();
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index 41ae5fe..7633407 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -30,6 +30,7 @@
import android.content.pm.UserInfo;
import android.os.Bundle;
import android.os.Environment;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.storage.StorageEventListener;
@@ -92,6 +93,8 @@
private static final String AUTHORITY_MEDIA = "com.android.providers.media.documents";
+ private static final String STORAGE_MANAGER_PROPERTY = "ro.storage_manager.enabled";
+
private static final int[] ITEMS_NO_SHOW_SHARED = new int[] {
R.string.storage_detail_apps,
R.string.storage_detail_system,
@@ -212,7 +215,7 @@
screen.removeAll();
- if (getResources().getBoolean(R.bool.config_has_storage_manager)) {
+ if (SystemProperties.getBoolean(STORAGE_MANAGER_PROPERTY, false)) {
addPreference(screen, mAutomaticStorageManagement);
}
addPreference(screen, mSummary);
@@ -396,7 +399,7 @@
mount.setVisible(false);
unmount.setVisible(false);
format.setVisible(false);
- manage.setVisible(getResources().getBoolean(R.bool.config_has_storage_manager));
+ manage.setVisible(SystemProperties.getBoolean(STORAGE_MANAGER_PROPERTY, false));
} else {
rename.setVisible(mVolume.getType() == VolumeInfo.TYPE_PRIVATE);
mount.setVisible(mVolume.getState() == VolumeInfo.STATE_UNMOUNTED);