Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e9ba0d7 authored Apr 11, 2016 by Jason Monk

Fix localization issues with disabled

Change-Id: Iba63b50000f546a1e323c855462841e82fce4df8
Fixes: 27948378

parent 65996601

res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -7385,4 +7385,7 @@
		<!-- 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>

		<!-- [CHAR LIMIT=25] Bluetooth is disabled. -->
		<string name="bluetooth_disabled">Disabled</string>

		</resources>

src/com/android/settings/bluetooth/BluetoothSettings.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

src/com/android/settings/wifi/WifiSettings.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);