Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 23c020a..02be71a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6788,6 +6788,10 @@
<string name="adaptive_connectivity_title">Adaptive connectivity</string>
<!-- Summary of Adaptive connectivity preference. [CHAR LIMIT=NONE] -->
<string name="adaptive_connectivity_summary">Extends battery life and improves device performance by automatically managing your network connections</string>
+ <!-- Switch on text of Adaptive connectivity preference. [CHAR LIMIT=NONE]-->
+ <string name="adaptive_connectivity_switch_on">On</string>
+ <!-- Switch off text of Adaptive connectivity preference. [CHAR LIMIT=NONE]-->
+ <string name="adaptive_connectivity_switch_off">Off</string>
<!-- Title of preference group for credential storage settings [CHAR LIMIT=30] -->
<string name="credentials_title">Credential storage</string>
diff --git a/src/com/android/settings/network/AdaptiveConnectivityPreferenceController.java b/src/com/android/settings/network/AdaptiveConnectivityPreferenceController.java
index 33d1d5b..a938515 100644
--- a/src/com/android/settings/network/AdaptiveConnectivityPreferenceController.java
+++ b/src/com/android/settings/network/AdaptiveConnectivityPreferenceController.java
@@ -48,7 +48,7 @@
public CharSequence getSummary() {
return Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1) == 1
- ? mContext.getString(R.string.switch_on_text)
- : mContext.getString(R.string.switch_off_text);
+ ? mContext.getString(R.string.adaptive_connectivity_switch_on)
+ : mContext.getString(R.string.adaptive_connectivity_switch_off);
}
}