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

Fix localization issues with disabled

Browse Source 
Change-Id: Iba63b50000f546a1e323c855462841e82fce4df8
Fixes: 27948378
This commit is contained in:
Jason Monk
2016-04-11 09:58:55 -04:00
parent 6599660196
commit 9e9ba0d751
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -7385,4 +7385,7 @@
<!-- Title of screen controlling which apps have access to send premium SMS messages [CHAR LIMIT=60] --> <!-- Title of screen controlling which apps have access to send premium SMS messages [CHAR LIMIT=60] -->
<string name="premium_sms_access">Premium SMS access</string> <string name="premium_sms_access">Premium SMS access</string>
<!-- [CHAR LIMIT=25] Bluetooth is disabled. -->
<string name="bluetooth_disabled">Disabled</string>
</resources> </resources>

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

@@ -518,7 +518,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
} }
private CharSequence getSummary() { private CharSequence getSummary() {
return mContext.getString(!mEnabled ? R.string.disabled return mContext.getString(!mEnabled ? R.string.bluetooth_disabled
: mConnected ? R.string.bluetooth_connected : mConnected ? R.string.bluetooth_connected
: R.string.bluetooth_disconnected); : R.string.bluetooth_disconnected);
} }

2
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -984,7 +984,7 @@ public class WifiSettings extends RestrictedSettingsFragment
private CharSequence getSummary() { private CharSequence getSummary() {
if (!mWifiTracker.enabled) { if (!mWifiTracker.enabled) {
return mContext.getString(R.string.disabled); return mContext.getString(R.string.wifi_disabled_generic);
} }
if (!mWifiTracker.connected) { if (!mWifiTracker.connected) {
return mContext.getString(R.string.disconnected); return mContext.getString(R.string.disconnected);