[Telephony Debug Menu] Redo Layout
Changes to the layout to better group
related fields, add more definite
boundaries, fix some alignment issues,
and put more-often-used fields closer
to the top.
Bug: 78791811
Test: manual
Change-Id: I492abe16a25d1880e4385a78247925805fe5b590
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index 177c73a..c1d6ff6 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -49,16 +49,10 @@
<TextView android:id="@+id/operator" style="@style/info_value" />
</LinearLayout>
- <!-- Signal Strength -->
+ <!-- Roaming -->
<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 -->
- <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,28 +61,28 @@
<TextView android:id="@+id/gprs" style="@style/info_value" />
</LinearLayout>
- <!-- 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 -->
+ <!-- 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>
- <!-- Call Status -->
+ <!-- Voice Service 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_gsm_service_label" style="@style/info_label" />
+ <TextView android:id="@+id/gsm" style="@style/info_value" />
</LinearLayout>
- <!-- Roaming -->
+ <!-- Voice Network Type -->
<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_voice_network_type_label" style="@style/info_label" />
+ <TextView android:id="@+id/voice_network" 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>
<!-- Link Bandwidth -->
@@ -134,69 +128,6 @@
android:layout_height="1dip"
android:background="#000000" />
- <!-- 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>
-
- <!-- 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>
-
- <!-- 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"
- style="@style/info_label" />
- <TextView android:id="@+id/sent" style="@style/info_value" />
- </LinearLayout>
-
- <!-- PPP Received -->
- <LinearLayout style="@style/entry_layout">
- <TextView android:text="@string/radio_info_ppp_received_label"
- style="@style/info_label" />
- <TextView android:id="@+id/received" style="@style/info_value" />
- </LinearLayout>
-
- <!-- PPP Sent since last received -->
- <LinearLayout style="@style/entry_layout">
- <TextView android:text="@string/radio_info_ppp_resets_label"
- style="@style/info_label" />
- <TextView android:id="@+id/sentSinceReceived" style="@style/info_value" />
- </LinearLayout>
-
<!-- Radio Power -->
<Switch android:id="@+id/radio_power"
android:textSize="14sp"
@@ -237,6 +168,157 @@
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"
+ 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>
+
+ <!-- Horizontal Rule -->
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="1dip"
+ android:background="#000000" />
+
+ <!-- PPP Sent -->
+ <LinearLayout style="@style/entry_layout">
+ <TextView android:text="@string/radio_info_ppp_sent_label"
+ style="@style/info_label" />
+ <TextView android:id="@+id/sent" style="@style/info_value" />
+ </LinearLayout>
+
+ <!-- PPP Received -->
+ <LinearLayout style="@style/entry_layout">
+ <TextView android:text="@string/radio_info_ppp_received_label"
+ style="@style/info_label" />
+ <TextView android:id="@+id/received" style="@style/info_value" />
+ </LinearLayout>
+
+ <!-- PPP Sent since last received -->
+ <LinearLayout style="@style/entry_layout">
+ <TextView android:text="@string/radio_info_ppp_resets_label"
+ style="@style/info_label" />
+ <TextView android:id="@+id/sentSinceReceived" style="@style/info_value" />
+ </LinearLayout>
+
+ <!-- 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_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"
+ />
+
+ <!-- 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_weight="1"
+ android:layout_width="0dp"
+ 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_weight="1"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:text="@string/trigger_carrier_provisioning"
+ android:textSize="14sp"/>
+ <Button android:id="@+id/oem_info"
+ android:layout_marginTop="8dip"
+ android:layout_weight="1"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:text="@string/oem_radio_info_label"
+ android:textSize="14sp"/>
+ </LinearLayout>
+
<!-- SMSC -->
<RelativeLayout android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -280,67 +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>
-
- <!-- 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>