From 9e9ba0d75142c7af9d8f7eabb7dfd34ff59e2064 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Mon, 11 Apr 2016 09:58:55 -0400
Subject: [PATCH] Fix localization issues with disabled

Change-Id: Iba63b50000f546a1e323c855462841e82fce4df8
Fixes: 27948378
---
 res/values/strings.xml                                    | 3 +++
 src/com/android/settings/bluetooth/BluetoothSettings.java | 2 +-
 src/com/android/settings/wifi/WifiSettings.java           | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 210ed5e05ab..5f8ad594f3b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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>
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index e565a617592..cc46fba351a 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -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);
         }
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 17cc3b67fe1..08e27ec3802 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -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);