PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Split "Mobile Network Type" indication in Settings" into pi-dev

Browse Source 
am: 8837f992bb

Change-Id: I41aec9f11b1e34cd56681b171a587bddb539f54e
This commit is contained in:
Hall Liu
2018-03-20 00:16:45 +00:00
committed by android-build-merger
parent f31a7c546d 8837f992bb
commit 0738a917df
5 changed files with 54 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/layout/dialog_sim_status.xml
View File

@@ -105,13 +105,26 @@
<TextView
style="@style/device_info_dialog_label"
android:id="@+id/network_type_label"
android:id="@+id/voice_network_type_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_network_type"/>
android:text="@string/status_voice_network_type"/>
<TextView
style="@style/device_info_dialog_value"
android:id="@+id/network_type_value"
android:id="@+id/voice_network_type_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/device_info_not_available"/>
<TextView
style="@style/device_info_dialog_label"
android:id="@+id/data_network_type_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/status_data_network_type"/>
<TextView
style="@style/device_info_dialog_value"
android:id="@+id/data_network_type_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/device_info_not_available"/>

4
res/values/strings.xml
View File

@@ -2750,7 +2750,9 @@
<!-- About phone, status item title. The ICCID of the current LTE device. [CHAR LIMIT=30] -->
<string name="status_icc_id">ICCID</string>
<!-- About phone, status item title for the type of data phone network we're connected to, for example 3G or Edge or GPRS -->
<string name="status_network_type">Mobile network type</string>
<string name="status_data_network_type">Mobile data network type</string>
<!-- About phone, status item title for the type of voice phone network we're connected to, for example 3G or Edge or GPRS -->
<string name="status_voice_network_type">Mobile voice network type</string>
<!-- About phone, status item title for the latest area info cell broadcast received (Brazil only). -->
<string name="status_latest_area_info">Operator info</string>
<!-- About phone, status item title. The status of data access. For example, the value may be "Connected" -->

97
res/xml/device_info_sim_status.xml
View File

@@ -1,97 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/sim_status_title">
<Preference android:key="operator_name"
android:enabled="false"
android:shouldDisableView="false"
android:title="@string/status_operator"
android:summary="@string/device_info_not_available"
android:persistent="false" />
<Preference android:key="signal_strength"
android:enabled="false"
android:shouldDisableView="false"
android:title="@string/status_signal_strength"
android:summary="@string/device_info_not_available"
android:persistent="false" />
<Preference android:key="network_type"
android:enabled="false"
android:shouldDisableView="false"
android:title="@string/status_network_type"
android:summary="@string/device_info_not_available"
android:persistent="false" />
<Preference android:key="latest_area_info"
android:enabled="false"
android:shouldDisableView="false"
android:title="@string/status_latest_area_info"
android:summary="@string/device_info_not_available"
android:persistent="false" />
<Preference android:key="service_state"
android:enabled="false"
android:shouldDisableView="false"
android:title="@string/status_service_state"
android:summary="@string/device_info_not_available"
android:persistent="false" />
<Preference android:key="roaming_state"
android:enabled="false"
android:shouldDisableView="false"
android:title="@string/status_roaming"
android:summary="@string/device_info_not_available"
android:persistent="false" />
<Preference android:key="data_state"
android:enabled="false"
android:shouldDisableView="false"
android:title="@string/status_data_state"
android:summary="@string/device_info_not_available"
android:persistent="false" />
<Preference android:key="number"
android:enabled="false"
android:shouldDisableView="false"
android:title="@string/status_number"
android:summary="@string/device_info_not_available"
android:persistent="false" />
<Preference android:key="imei"
android:enabled="false"
android:shouldDisableView="false"
android:title="@string/status_imei"
android:summary="@string/device_info_not_available"
android:persistent="false" />
<Preference android:key="imei_sv"
android:enabled="false"
android:shouldDisableView="false"
android:title="@string/status_imei_sv"
android:summary="@string/device_info_not_available"
android:persistent="false" />
<Preference android:key="iccid"
android:enabled="false"
android:shouldDisableView="false"
android:title="@string/status_iccid"
android:summary="@string/device_info_not_available"
android:persistent="false" />
</PreferenceScreen>