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

Commit 60d20574 authored by Betty Chang's avatar Betty Chang Committed by Android (Google) Code Review
Browse files

Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev

parents f5a55229 b453e44b

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -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>

























src/com/android/settings/network/AdaptiveConnectivityPreferenceController.java



+2
−2






























Original line number
Diff line number
Diff line







@@ -48,7 +48,7 @@ public class AdaptiveConnectivityPreferenceController extends BasePreferenceCont







    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);









    }









}