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

Commit 326c91c8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Show IMSI in RadioInfo."

parents 928045e5 9053f17b

res/layout/radio_info.xml

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,12 @@ 
            <TextView android:id="@+id/number" style="@style/info_value" />

        </LinearLayout>



        <!-- IMSI -->

        <LinearLayout style="@style/entry_layout">

            <TextView android:text="@string/radio_info_imsi_label" style="@style/info_label" />

            <TextView android:id="@+id/imsi" style="@style/info_value" />

        </LinearLayout>



        <!-- Network Identifier -->

        <LinearLayout style="@style/entry_layout">

            <TextView android:text="@string/radio_info_current_network_label" style="@style/info_label" />

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -462,6 +462,8 @@ 
    <string name="radio_info_roaming_label">Roaming:</string>

    <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->

    <string name="radio_info_imei_label">IMEI:</string>

    <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, DO NOT TRANSLATE. -->

    <string name="radio_info_imsi_label">IMSI:</string>

    <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->

    <string name="radio_info_call_redirect_label">Call Redirect:</string>

    <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->

src/com/android/settings/RadioInfo.java

+7 −1
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ public class RadioInfo extends Activity { 


    private TextView mDeviceId; //DeviceId is the IMEI in GSM and the MEID in CDMA

    private TextView number;

    private TextView mSubscriberId;

    private TextView callState;

    private TextView operatorName;

    private TextView roamingState;
@@ -373,6 +374,7 @@ public class RadioInfo extends Activity { 


        mDeviceId = (TextView) findViewById(R.id.imei);

        number = (TextView) findViewById(R.id.number);

        mSubscriberId = (TextView) findViewById(R.id.imsi);

        callState = (TextView) findViewById(R.id.call);

        operatorName = (TextView) findViewById(R.id.operator);

        roamingState = (TextView) findViewById(R.id.roaming);
@@ -896,6 +898,10 @@ public class RadioInfo extends Activity { 
        if (s == null) s = r.getString(R.string.radioInfo_unknown);

        mDeviceId.setText(s);



        s = phone.getSubscriberId();

        if (s == null) s = r.getString(R.string.radioInfo_unknown);

        mSubscriberId.setText(s);



        //FIXME: Replace with a TelephonyManager call

        s = phone.getLine1Number();

        if (s == null) s = r.getString(R.string.radioInfo_unknown);