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

Merge "[Wi-Fi] Support multi-SIM for SIM dependent EAP methods" into rvc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-08-07 11:37:27 +00:00
committed by Android (Google) Code Review
parent 62da4cd15c 2df3a3e7df
commit edd587c2a6
9 changed files with 457 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/layout/wifi_dialog.xml
View File

@@ -141,6 +141,24 @@
android:prompt="@string/wifi_eap_method" />
</LinearLayout>
<LinearLayout android:id="@+id/l_sim"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
style="@style/wifi_item" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label"
android:text="@string/sim_card" />
<Spinner android:id="@+id/sim"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_spinner"
android:prompt="@string/sim_card" />
</LinearLayout>
<LinearLayout android:id="@+id/l_phase2"
android:layout_width="match_parent"
android:layout_height="wrap_content"

11
res/values/strings.xml
View File

@@ -11481,6 +11481,17 @@
<!-- Message informs the user that has no SIM card in personalized Settings [CHAR LIMIT=30] -->
<string name="no_sim_card">No SIM card</string>
<!-- A title for a SIM card spinner UI component which users can choose a SIM card. [CHAR LIMIT=NONE] -->
<string name="sim_card">SIM</string>
<!-- A label when there is no SIM card to choose. [CHAR LIMIT=NONE] -->
<string name="wifi_no_sim_card">No SIM</string>
<!-- A label when there is no SIM card information of a Wi-Fi network. [CHAR LIMIT=NONE] -->
<string name="wifi_no_related_sim_card">None</string>
<!-- A label wen a user needs a SIM to connect to the Wi-Fi network. [CHAR LIMIT=NONE] -->
<string name="wifi_require_sim_card_to_connect">Requires SIM to connect</string>
<!-- A label wen a user needs a specific SIM to connect to the Wi-Fi network. [CHAR LIMIT=NONE] -->
<string name="wifi_require_specific_sim_card_to_connect">Requires <xliff:g id="wireless_carrier" example="Verizon">%s</xliff:g> SIM to connect</string>
<!-- The following strings are summaries for preferred network modes in Mobile network settings,
and have a character limit of 100 -->
<!-- WCDMA preferred [CHAR LIMIT=NONE] -->

5
res/xml/wifi_network_details_fragment2.xml
View File

@@ -105,6 +105,11 @@
android:title="@string/wifi_advanced_ssid_title"
android:selectable="false"
settings:enableCopying="true"/>
<Preference
android:key="eap_sim_subscription"
android:title="@string/sim_card"
android:selectable="false"
settings:enableCopying="true"/>
<Preference
android:key="mac_address"
android:title="@string/wifi_advanced_randomized_mac_address_title"