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

Commit 1aab1f7d authored by Daniel Bright's avatar Daniel Bright
Browse files

Remove overlapping resources 

* Remove resources from resource files that should only live
in frameworks/base.
* Java code pointing to removed resources now point to
frameworks/base.

Test: TeleServiceTests
Bug: 149401237
Change-Id: I5caec1dc31d2e0491f50573a8d3c7fac9da08cb1
parent 04263d17

res/values/donottranslate_config.xml

+0 −3
Original line number Diff line number Diff line
@@ -197,9 +197,6 @@ 
    <!-- Whether cbrs is supported on the device or not -->

    <bool name="config_cbrs_supported">false</bool>



    <!-- Enables SIP on WIFI only -->

    <bool name="config_sip_wifi_only">false</bool>



    <!-- Name of the dialog that is used to install the carrier app when the SIM is inserted -->

    <string name="config_carrierAppInstallDialogComponent"

            >com.android.simappdialog/com.android.simappdialog.InstallCarrierAppActivity</string>

res/values/overlayable.xml

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 
            <item type="string" name="config_ims_package"/>

            <item type="string" name="config_carrierAppInstallDialogComponent"/>

            <item type="bool" name="config_cbrs_supported"/>

            <item type="bool" name="config_sip_wifi_only"/>

            <item type="string" name="mobile_provisioning_apn"/>

            <item type="array" name="config_cell_retries_per_error_code"/>

            <item type="bool" name="config_auto_attach_data_on_creation"/>

res/values/strings.xml

+5 −28
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ 
    <!-- Displayed when a carrier does not support call forwarding queries when roaming. -->

    <string name="mmiErrorWhileRoaming">Can not change call forwarding settings from your phone while you are roaming.</string>



    <!-- What the UI should display for "voice mail" unless overridden by the SIM-->

    <string name="defaultVoiceMailAlphaTag">Voicemail</string>



    <!-- Displayed when a phone feature such as call barring was activated. -->

    <string name="serviceEnabled">Service was enabled.</string>

    <!-- Displayed in front of the list of a set of service classes
@@ -332,8 +329,11 @@ 
    <string name="sim_added_title">SIM card added</string>

    <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->

    <string name="sim_added_message">Restart your device to access the mobile network.</string>

    <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->

    <string name="sim_restart_button">Restart</string>



    <!-- Keep sim_restart_button is in frameworks/base due to reference in global_action_restart -->

    <!--string name="sim_restart_button">Restart</string-->

    <skip />



    <!-- See Carrier_App_Dialog. This is the message of that dialog. -->

    <string name="install_carrier_app_notification_title">Activate mobile service</string>

    <!-- Notification message that shows when the user inserts a SIM card that requires a carrier app download, but the app name is unknown -->
@@ -386,27 +386,4 @@ 
    <string name="mmcc_imsi_unknown_in_hlr_msim_template">SIM <xliff:g id="simNumber" example="1">%d</xliff:g> not provisioned</string>

    <string name="mmcc_illegal_ms_msim_template">SIM <xliff:g id="simNumber" example="1">%d</xliff:g> not allowed</string>

    <string name="mmcc_illegal_me_msim_template">SIM <xliff:g id="simNumber" example="1">%d</xliff:g> not allowed</string>



    <!-- Shown in the lock screen when there is emergency calls only mode. -->

    <string name="emergency_calls_only" msgid="2485604591272668370">Emergency calls only</string>



    <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->

    <string name="lockscreen_carrier_default">No service</string>



    <!-- Status message for a remote route attempting to connect -->

    <string name="media_route_status_connecting">Connecting...</string>



    <!-- WFC, summary for Disabled -->

    <string name="wifi_calling_off_summary">Off</string>

    <!-- WFC, summary for Wi-Fi Preferred -->

    <string name="wfc_mode_wifi_preferred_summary">Call over Wi-Fi</string>

    <!-- WFC, summary for Mobile data Preferred -->

    <string name="wfc_mode_cellular_preferred_summary">Call over mobile network</string>

    <!-- WFC, summary for Wi-Fi Only -->

    <string name="wfc_mode_wifi_only_summary">Wi-Fi only</string>



    <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash

         with spaces on either side. [CHAR LIMIT=3] -->

    <string name="kg_text_message_separator" product="default">" \u2014 "</string>



</resources>

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+1 −2
Original line number Diff line number Diff line
@@ -1681,8 +1681,7 @@ public class GsmCdmaPhone extends Phone { 
        }



        if (ret == null || ret.length() == 0) {

            return TelephonyResourceUtils.getTelephonyResourceContext(mContext).getText(

                com.android.telephony.resources.R.string.defaultVoiceMailAlphaTag).toString();

            return mContext.getString(android.R.string.defaultVoiceMailAlphaTag);

        }



        return ret;

src/java/com/android/internal/telephony/ServiceStateTracker.java

+12 −12
Original line number Diff line number Diff line
@@ -2702,14 +2702,12 @@ public class ServiceStateTracker extends Handler { 
                final boolean forceDisplayNoService = shouldForceDisplayNoService() && !mIsSimReady;

                if (!forceDisplayNoService && Phone.isEmergencyCallOnly()) {

                    // No service but emergency call allowed

                    plmn = TelephonyResourceUtils.getTelephonyResources(mPhone.getContext())

                            .getText(com.android.telephony.resources.R.string.emergency_calls_only)

                    plmn = mPhone.getContext().getResources()

                            .getText(com.android.internal.R.string.emergency_calls_only)

                            .toString();

                } else {

                    // No service at all

                    plmn = TelephonyResourceUtils.getTelephonyResources(mPhone.getContext())

                            .getText(com.android.telephony.resources.R.string

                                    .lockscreen_carrier_default).toString();

                    plmn = getLockscreenCarrierDefaultText();

                    noService = true;

                }

                if (DBG) log("updateSpnDisplay: radio is on but out " +
@@ -2724,9 +2722,7 @@ public class ServiceStateTracker extends Handler { 
            } else {

                // Power off state, such as airplane mode, show plmn as "No service"

                showPlmn = true;

                plmn = TelephonyResourceUtils.getTelephonyResources(mPhone.getContext())

                        .getText(com.android.telephony.resources.R.string

                                .lockscreen_carrier_default).toString();

                plmn = getLockscreenCarrierDefaultText();

                if (DBG) log("updateSpnDisplay: radio is off w/ showPlmn="

                        + showPlmn + " plmn=" + plmn);

            }
@@ -2794,9 +2790,7 @@ public class ServiceStateTracker extends Handler { 
            }



            if (combinedRegState == ServiceState.STATE_OUT_OF_SERVICE) {

                plmn = TelephonyResourceUtils.getTelephonyResources(mPhone.getContext()).getText(

                                com.android.telephony.resources.R.string.lockscreen_carrier_default)

                        .toString();

                plmn = getLockscreenCarrierDefaultText();

                if (DBG) {

                    log("updateSpnDisplay: radio is on but out of svc, set plmn='" + plmn + "'");

                }
@@ -5726,4 +5720,10 @@ public class ServiceStateTracker extends Handler { 
        values.put(SERVICE_STATE, p.marshall());

        return values;

    }



    private String getLockscreenCarrierDefaultText() {

        return mPhone.getContext().getResources()

                .getText(com.android.internal.R.string.lockscreen_carrier_default)

                .toString();

    }

}