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

Fix localization issues with disabled am: 9e9ba0d

Browse Source 
am: 22b5064

* commit '22b5064424547daf4cdda5d106aa559539e89c23':
  Fix localization issues with disabled

Change-Id: I958dffd6f1c8370d5408b811a804411095a9eb74
This commit is contained in:
Jason Monk
2016-04-11 14:20:17 +00:00
committed by android-build-merger
parent 19fad2550e 22b5064424
commit 4b32de0d35
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -518,7 +518,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
}
private CharSequence getSummary() {
return mContext.getString(!mEnabled ? R.string.disabled
return mContext.getString(!mEnabled ? R.string.bluetooth_disabled
: mConnected ? R.string.bluetooth_connected
: 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() {
if (!mWifiTracker.enabled) {
return mContext.getString(R.string.disabled);
return mContext.getString(R.string.wifi_disabled_generic);
}
if (!mWifiTracker.connected) {
return mContext.getString(R.string.disconnected);