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

Commit 5ff91e4f authored by nharold's avatar nharold Committed by Gerrit Code Review
Browse files

Merge changes from topic "telephony-debug-pi-tweaks" 

* changes:
  [Telephony Debug Menu] Redo Layout
  [Telephony Debug Menu] Remove DcRtInfo
  [Telephony Debug Menu] Remove NeighboringCellInfo
  [Telephony Debug Menu] Add Link Capacity Estimate
  [Telephony Debug Menu] Add Physical Channel Config
  [Telephony Debug Menu] LTE BW and Serving CellInfo
parents 2d523f4e c0acff57

res/layout/radio_info.xml

+171 −140
Original line number Diff line number Diff line
@@ -49,16 +49,10 @@ 
            <TextView android:id="@+id/operator" style="@style/info_value" />

        </LinearLayout>



        <!-- Signal Strength -->

        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>



        <!-- Voice Service Status -->

        <!-- Roaming -->

        <LinearLayout style="@style/entry_layout">

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

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

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

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

        </LinearLayout>



        <!-- Data Service Status -->
@@ -67,30 +61,54 @@ 
            <TextView android:id="@+id/gprs" style="@style/info_value" />

        </LinearLayout>



        <!-- Network Type -->

        <!-- Data Network Type -->

        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>



        <!-- Voice Service Status -->

        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>



        <!-- Voice Network Type -->

        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>



        <!-- Network Type -->

        <!-- Signal Strength -->

        <LinearLayout style="@style/entry_layout">

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

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

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

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

        </LinearLayout>



        <!-- Call Status -->

        <LinearLayout style="@style/entry_layout">

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

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

        <!-- Link Bandwidth -->

        <LinearLayout style="@style/entry_layout" android:orientation="horizontal">

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

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

        </LinearLayout>



        <!-- Roaming -->

        <!-- Link Bandwidth -->

        <LinearLayout style="@style/entry_layout" android:orientation="horizontal">

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

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

        </LinearLayout>



        <!-- Physical Channel Config -->

        <LinearLayout style="@style/entry_layout">

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

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

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

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

        </LinearLayout>



        <!-- Horizontal Rule -->

        <View

            android:layout_width="fill_parent"

            android:layout_height="1dip"

            android:background="#000000" />



        <!-- Preferred Network Type -->

        <TextView

                android:layout_width="match_parent"
@@ -110,6 +128,52 @@ 
            android:layout_height="1dip"

            android:background="#000000" />



        <!-- Radio Power -->

        <Switch android:id="@+id/radio_power"

                android:textSize="14sp"

                android:layout_marginTop="8dip"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/radio_info_radio_power"/>



        <!-- VoLTE provisioned -->

        <Switch android:id="@+id/volte_provisioned_switch"

                android:textSize="14sp"

                android:layout_marginTop="8dip"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/volte_provisioned_switch_string"/>



        <!-- VT provisioned -->

        <Switch android:id="@+id/vt_provisioned_switch"

                android:textSize="14sp"

                android:layout_marginTop="8dip"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/vt_provisioned_switch_string"/>



        <!-- Wifi Calling provisioned -->

        <Switch android:id="@+id/wfc_provisioned_switch"

                android:textSize="14sp"

                android:layout_marginTop="8dip"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/wfc_provisioned_switch_string"/>



        <!-- EAB/Presence provisioned -->

        <Switch android:id="@+id/eab_provisioned_switch"

                android:textSize="14sp"

                android:layout_marginTop="8dip"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/eab_provisioned_switch_string"/>



        <!-- Horizontal Rule -->

        <View

            android:layout_width="fill_parent"

            android:layout_height="1dip"

            android:background="#000000" />



        <!-- Ping stats -->

        <Button android:id="@+id/ping_test"

                android:textSize="14sp"
@@ -140,25 +204,6 @@ 
            android:layout_height="1dip"

            android:background="#000000" />



        <!-- DcRtInfo - DataConnectionRealTimeInfo -->

        <LinearLayout style="@style/entry_layout">

            <TextView android:text="@string/radio_info_dcrtinfo_label"

                      style="@style/info_label" />

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

        </LinearLayout>



        <!-- Message Waiting Indicator -->

        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>



        <!-- Call Forwarding Indicator -->

        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>



        <!-- PPP Sent -->

        <LinearLayout style="@style/entry_layout">

            <TextView android:text="@string/radio_info_ppp_sent_label"
@@ -180,45 +225,99 @@ 
            <TextView android:id="@+id/sentSinceReceived" style="@style/info_value" />

        </LinearLayout>



        <!-- Radio Power -->

        <Switch android:id="@+id/radio_power"

                android:textSize="14sp"

                android:layout_marginTop="8dip"

        <!-- Horizontal Rule -->

        <View

            android:layout_width="fill_parent"

            android:layout_height="1dip"

            android:background="#000000" />



        <!-- Call Status -->

        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>



        <!-- Message Waiting Indicator -->

        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>



        <!-- Call Forwarding Indicator -->

        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>



        <!-- Horizontal Rule -->

        <View

            android:layout_width="fill_parent"

            android:layout_height="1dip"

            android:background="#000000" />



        <!-- CellInfoListRate Selection -->

        <!-- Location -->

        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>



        <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/radio_info_radio_power"/>

                android:text="@string/radio_info_cell_info_refresh_rate"

                style="@style/info_label"

                />



        <!-- VoLTE provisioned -->

        <Switch android:id="@+id/volte_provisioned_switch"

                android:textSize="14sp"

                android:layout_marginTop="8dip"

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

                 android:layout_width="match_parent"

                 android:layout_height="wrap_content"

                android:text="@string/volte_provisioned_switch_string"/>

                />



        <!-- VT provisioned -->

        <Switch android:id="@+id/vt_provisioned_switch"

                android:textSize="14sp"

        <!-- CellInfo -->

        <LinearLayout style="@style/entry_layout">

            <TextView android:text="@string/radio_info_cellinfo_label"

                      style="@style/info_label" />

        </LinearLayout>

        <LinearLayout style="@style/entry_layout">

            <TextView android:id="@+id/cellinfo"

                      style="@style/info_value"

                      android:minHeight="300dip"

                      android:textSize="12sp" />

        </LinearLayout>



        <!-- Horizontal Rule -->

        <View

            android:layout_width="fill_parent"

            android:layout_height="1dip"

            android:background="#000000" />



        <!-- Launch OEM-specific Info/Settings Activity (if any) -->

        <!-- Carrier Provisioning -->

        <LinearLayout style="@style/entry_layout"

                      android:orientation="horizontal" >

            <Button android:id="@+id/carrier_provisioning"

                    android:layout_marginTop="8dip"

                android:layout_width="match_parent"

                    android:layout_weight="1"

                    android:layout_width="0dp"

                    android:layout_height="wrap_content"

                android:text="@string/vt_provisioned_switch_string"/>



        <!-- Wifi Calling provisioned -->

        <Switch android:id="@+id/wfc_provisioned_switch"

                android:textSize="14sp"

                    android:text="@string/carrier_provisioning"

                    android:textSize="14sp"/>

            <Button android:id="@+id/trigger_carrier_provisioning"

                    android:layout_marginTop="8dip"

                android:layout_width="match_parent"

                    android:layout_weight="1"

                    android:layout_width="0dp"

                    android:layout_height="wrap_content"

                android:text="@string/wfc_provisioned_switch_string"/>



        <!-- EAB/Presence provisioned -->

        <Switch android:id="@+id/eab_provisioned_switch"

                android:textSize="14sp"

                    android:text="@string/trigger_carrier_provisioning"

                    android:textSize="14sp"/>

            <Button android:id="@+id/oem_info"

                    android:layout_marginTop="8dip"

                android:layout_width="match_parent"

                    android:layout_weight="1"

                    android:layout_width="0dp"

                    android:layout_height="wrap_content"

                android:text="@string/eab_provisioned_switch_string"/>

                    android:text="@string/oem_radio_info_label"

                    android:textSize="14sp"/>

        </LinearLayout>



        <!-- SMSC -->

        <RelativeLayout android:layout_width="match_parent"
@@ -263,74 +362,6 @@ 
            <TextView android:id="@+id/dnsCheckState" style="@style/info_value" />

        </LinearLayout>



        <!-- Launch OEM-specific Info/Settings Activity (if any) -->

        <Button android:id="@+id/oem_info"

                android:textSize="14sp"

                android:layout_marginTop="8dip"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/oem_radio_info_label"

                />



        <!-- Horizontal Rule -->

        <View

            android:layout_width="fill_parent"

            android:layout_height="1dip"

            android:background="#000000" />



        <!-- CellInfoListRate Selection -->

        <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/radio_info_cell_info_refresh_rate"

                style="@style/info_label"

                />



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

                 android:layout_width="match_parent"

                 android:layout_height="wrap_content"

                />



        <!-- Location -->

        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>



        <!-- Neighboring Cids -->

        <LinearLayout style="@style/entry_layout">

            <TextView android:text="@string/radio_info_neighboring_location_label"

                      style="@style/info_label" />

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

        </LinearLayout>



        <!-- CellInfo -->

        <LinearLayout style="@style/entry_layout">

            <TextView android:text="@string/radio_info_cellinfo_label"

                      style="@style/info_label" />

        </LinearLayout>

        <LinearLayout style="@style/entry_layout">

            <TextView android:id="@+id/cellinfo"

                      style="@style/info_value"

                      android:minHeight="300dip"

                      android:textSize="12sp" />

        </LinearLayout>



        <!-- Carrier Provisioning -->

        <LinearLayout style="@style/entry_layout">

            <Button android:id="@+id/carrier_provisioning"

                    android:layout_marginTop="8dip"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/carrier_provisioning"

                    android:textSize="14sp"/>

            <Button android:id="@+id/trigger_carrier_provisioning"

                    android:layout_marginTop="8dip"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/trigger_carrier_provisioning"

                    android:textSize="14sp"/>

        </LinearLayout>



    </LinearLayout>

</ScrollView>

res/values/strings.xml

+5 −3
Original line number Diff line number Diff line
@@ -446,17 +446,19 @@ 
    <!-- HTTP proxy settings. Title for Proxy-Auto Config URL.  [CHAR LIMIT=25] -->

    <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_dl_kbps">DL Bandwidth (kbps):</string>









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









    <string name="radio_info_ul_kbps">UL Bandwidth (kbps):</string>









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









    <string name="radio_info_signal_location_label">Cell Location Info (deprecated):</string>









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









    <string name="radio_info_neighboring_location_label">Neighbor Cell Info (deprecated):</string>









    <string name="radio_info_phy_chan_config">LTE Physical Channel Configuration:</string>









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









    <string name="radio_info_cell_info_refresh_rate">Cell Info Refresh Rate:</string>









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









    <string name="radio_info_cellinfo_label">All Cell Measurement Info:</string>









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









    <string name="radio_info_dcrtinfo_label">Data Connection Real-Time Info:</string>









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









    <string name="radio_info_gprs_service_label">Data Service:</string>









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









    <string name="radio_info_roaming_label">Roaming:</string>
































src/com/android/settings/RadioInfo.java



+103
−48




























File changed.
Preview size limit exceeded, changes collapsed.