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

Commit 2b77d746 authored by Nathan Harold's avatar Nathan Harold
Browse files

Cleanup RadioInfo Test Menu 

-Convert multi-mode buttons to toggle switches to reduce
 confusion.
-Remove long-deprecated PhoneStateIntentReceiver references
 and convert all functions to use PhoneStateListener
-Remove vestigial menu items that no longer reference working
 system properties or code
-Add new ARFCN/UARFCN/EARFCN fields to CellInfo Display
-Convert CellInfoListRate to a Dropdown menu
-Fixed bugs with screen rotation that caused network preferences
 to change (and could crash the radio)
-Fixed bugs related to onResume not updating values correctly
-Re-ordered menu items to group like-items together
-Minor string edits for clarity, correctness, and consistency

Change-Id: Ied5ed7a250682ee3327e51884d80ee4f3a7eb913
parent 43fa74b9

res/layout/radio_info.xml

+112 −131
Original line number Diff line number Diff line
@@ -41,71 +41,40 @@ 
            <TextView android:id="@+id/operator" style="@style/info_value" />

        </LinearLayout>



        <!-- Ping stats -->

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

                android:textSize="14sp"

                android:layout_marginTop="8dip"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/ping_test_label"

                />

 

        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>



        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>



        <LinearLayout style="@style/entry_layout">

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

            <TextView android:id="@+id/httpClientTest" 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>



        <!-- CellInfoListRate -->

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

                android:textSize="14sp"

                android:layout_marginTop="8dip"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                />



        <!-- Location -->

        <!-- Voice Service Status -->

        <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" />

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

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

        </LinearLayout>



        <!-- Neighboring Cids -->

        <!-- Data Service Status -->

        <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" />

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

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

        </LinearLayout>



        <!-- CellInfo -->

        <!-- Network Type -->

        <LinearLayout style="@style/entry_layout">

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

                      style="@style/info_label" />

            <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 -->

        <LinearLayout style="@style/entry_layout">

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

            <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>



        <!-- DcRtInfo - DataConnectionRealTimeInfo -->

        <!-- Call Status -->

        <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" />

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

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

        </LinearLayout>



        <!-- Roaming -->
@@ -114,67 +83,72 @@ 
            <TextView android:id="@+id/roaming" style="@style/info_value" />

        </LinearLayout>



        <!-- GSM Service -->

        <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>

        <!-- Preferred Network Type -->

        <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/radio_info_set_perferred_label"

                style="@style/info_label"

                />



        <!-- GPRS Service -->

        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>

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

                 android:layout_width="match_parent"

                 android:layout_height="wrap_content"

                />



        <!-- Network Type -->

        <LinearLayout style="@style/entry_layout">

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

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

        </LinearLayout>

        <!-- Horizontal Rule -->

        <View

            android:layout_width="fill_parent"

            android:layout_height="1dip"

            android:background="#000000" />



        <!-- 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>

        <!-- Ping stats -->

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

                android:textSize="14sp"

                android:layout_marginTop="8dip"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/ping_test_label"

                />

 

        <!-- 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" />

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

            <TextView android:id="@+id/pingHostnameV4" 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" />

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

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

        </LinearLayout>



        <!-- Radio Resets -->

        <LinearLayout style="@style/entry_layout">

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

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

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

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

        </LinearLayout>



        <!-- Attempted Data Connections -->

        <!-- Horizontal Rule -->

        <View

            android:layout_width="fill_parent"

            android:layout_height="1dip"

            android:background="#000000" />



        <!-- DcRtInfo - DataConnectionRealTimeInfo -->

        <LinearLayout style="@style/entry_layout">

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

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

                      style="@style/info_label" />

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

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

        </LinearLayout>



        <!-- Successful Data Connections -->

        <!-- Message Waiting Indicator -->

        <LinearLayout style="@style/entry_layout">

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

                style="@style/info_label" />

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

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

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

        </LinearLayout>



        <!-- GSM Disconnects -->

        <!-- Call Forwarding Indicator -->

        <LinearLayout style="@style/entry_layout">

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

                style="@style/info_label" />

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

            <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 -->
@@ -198,58 +172,21 @@ 
            <TextView android:id="@+id/sentSinceReceived" style="@style/info_value" />

        </LinearLayout>



        <!-- Preferred Network Type -->

        <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/radio_info_set_perferred_label"

                style="@style/info_label"

                />



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

                 android:layout_width="match_parent"

                 android:layout_height="wrap_content"

                />



        <!-- Radio Power -->

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

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

                android:textSize="14sp"

                android:layout_marginTop="8dip"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                />



       <!-- IMS registration required -->

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

                android:textSize="14sp"

                android:layout_marginTop="8dip"

                android:layout_width="wrap_content"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                />

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



        <!-- VoLTE provisioned -->

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

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

                android:textSize="14sp"

                android:layout_marginTop="8dip"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                />



        <!-- SMS over IMS -->

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

                android:textSize="14sp"

                android:layout_marginTop="8dip"

                android:layout_width="wrap_content"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                />



        <!-- LTE ram dump -->

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

                android:textSize="14sp"

                android:layout_marginTop="8dip"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                />

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



        <!-- SMSC -->

        <RelativeLayout android:layout_width="match_parent"
@@ -303,5 +240,49 @@ 
                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>



    </LinearLayout>

</ScrollView>

res/values/strings.xml

+41 −61

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/settings/RadioInfo.java

+212 −362

File changed.

Preview size limit exceeded, changes collapsed.