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

Commit ac4e5dfa authored by Jordan Liu's avatar Jordan Liu Committed by Android (Google) Code Review
Browse files

Merge "Make RadioInfo settings menu work for mSIM" into qt-dev

parents 24c02bb5 85f1d2a7

res/layout/radio_info.xml

+25 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,19 @@ 
        android:descendantFocusability="beforeDescendants"

        android:descendantFocusability="beforeDescendants"

        android:focusableInTouchMode="true">

        android:focusableInTouchMode="true">





        <!-- Phone index -->

        <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/phone_index_label"

                style="@style/info_label"

                />



        <Spinner android:id="@+id/phoneIndex"

                 android:layout_width="match_parent"

                 android:layout_height="wrap_content"

                />



        <!-- IMEI -->

        <!-- IMEI -->

        <LinearLayout style="@style/entry_layout">

        <LinearLayout style="@style/entry_layout">

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

            <TextView android:text="@string/radio_info_imei_label" style="@style/info_label" />
@@ -37,6 +50,18 @@ 
            <TextView android:id="@+id/number" style="@style/info_value" />

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

        </LinearLayout>

        </LinearLayout>





        <!-- Subscription ID -->

        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>



        <!-- Default data subscription -->

        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>



        <!-- IMSI -->

        <!-- IMSI -->

        <LinearLayout style="@style/entry_layout">

        <LinearLayout style="@style/entry_layout">

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

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

res/values/strings.xml

+6 −0
Original line number Original line Diff line number Diff line
@@ -484,6 +484,10 @@ 
    <!-- HTTP proxy settings. Title for Proxy-Auto Config URL.  [CHAR LIMIT=25] -->

    <!-- HTTP proxy settings. Title for Proxy-Auto Config URL.  [CHAR LIMIT=25] -->

    <string name="proxy_url_title">"PAC URL: "</string>

    <string name="proxy_url_title">"PAC URL: "</string>




















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














    <string name="radio_info_subid">Current subId:</string>














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














    <string name="radio_info_dds">SubId of default data SIM:</string>











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







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











    <string name="radio_info_dl_kbps">DL Bandwidth (kbps):</string>







    <string name="radio_info_dl_kbps">DL Bandwidth (kbps):</string>











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







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










@@ -531,6 +535,8 @@









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







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











    <string name="radio_info_data_network_type_label">Data Network Type:</string>







    <string name="radio_info_data_network_type_label">Data Network Type:</string>











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







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














    <string name="phone_index_label">Select phone index</string>














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











    <string name="radio_info_set_perferred_label">Set Preferred Network Type:</string>







    <string name="radio_info_set_perferred_label">Set Preferred Network Type:</string>











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







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











    <string name="radio_info_ping_hostname_v4">Ping Hostname(www.google.com) IPv4:</string>







    <string name="radio_info_ping_hostname_v4">Ping Hostname(www.google.com) IPv4:</string>

































src/com/android/settings/RadioInfo.java



+187
−74


























File changed.
Preview size limit exceeded, changes collapsed.