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

Commit 6dd85950 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Make phone status string translatable." into cm-11.0

parents 762c0f0b 71a00988

res/values/cm_strings.xml

+2 −1
Original line number Diff line number Diff line
@@ -502,7 +502,8 @@ two in order to insert additional control points. \'Remove\' deletes the selecte 
    <string name="cpu_info">CPU</string>

    <!-- About phone screen, Free memory info -->

    <string name="mem_info">Memory</string>

    <!-- About phone screen, status item label -->

    <!-- About phone screen, service state -->

    <string name="phone_service_state">Voice: <xliff:g id="voice_state">%1$s</xliff:g>, data: <xliff:g id="data_state">%2$s</xliff:g></string>



    <!-- Anonymous Statistics #CM -->

    <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->

src/com/android/settings/deviceinfo/Status.java

+6 −4
Original line number Diff line number Diff line
@@ -444,12 +444,14 @@ public class Status extends PreferenceActivity { 


    private void updateServiceState(ServiceState serviceState) {

        int voiceState = serviceState.getState();

        String voiceDisplay = getServiceStateString(voiceState);



        int dataState = serviceState.getDataRegState();

        String dataDisplay = getServiceStateString(dataState);



        setSummaryText(KEY_SERVICE_STATE, "Voice: " + voiceDisplay + " / Data: " + dataDisplay);

        if (voiceState == dataState) {

            setSummaryText(KEY_SERVICE_STATE, getServiceStateString(voiceState));

        } else {

            setSummaryText(KEY_SERVICE_STATE, mRes.getString(R.string.phone_service_state,

                        getServiceStateString(voiceState), getServiceStateString(dataState)));

        }



        if (serviceState.getRoaming()) {

            setSummaryText(KEY_ROAMING_STATE, mRes.getString(R.string.radioInfo_roaming_in));