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

Merge "[ProviderModel] Use category to separate physical SIM and e-SIM" into sc-dev am: c968a80ff6 am: 67551e8dd2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732243

Change-Id: I3eb65cd4c03278f578d8582cf5cb7f31d83e2742
This commit is contained in:
Zoey Chen
2021-06-01 02:58:59 +00:00
committed by Automerger Merge Worker
parent e45d19c091 67551e8dd2
commit fe8f6a1c99
12 changed files with 1366 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/values/strings.xml
View File

@@ -13248,6 +13248,22 @@
<string name="carrier_wifi_offload_summary">Allow Google Fi to use W+ networks to improve speed and coverage</string>
<!-- Title for merged carrier Wi-Fi network information. [CHAR LIMIT=NONE] -->
<string name="carrier_wifi_network_title">W+ network</string>
<!-- Provider Model: title of SIM category -->
<string name="sim_category_title">SIM</string>
<!-- Provider Model: title of Downloaded category. [CHAR LIMIT=50] -->
<string name="downloaded_sim_category_title">DOWNLOADED SIM</string>
<!-- Provider Model: summary of Active in SIM category. [CHAR LIMIT=50] -->
<string name="sim_category_active_sim">Active</string>
<!-- Provider Model: summary of Inactive in SIM category. [CHAR LIMIT=50] -->
<string name="sim_category_inactive_sim">Inactive</string>
<!-- Provider Model: summary of default config. [CHAR LIMIT=50] -->
<string name="sim_category_default_active_sim">\u0020/ Default for <xliff:g name="default_sim_config" example=" / Default for calls">%1$s</xliff:g></string>
<!-- Provider Model: summary of default call. [CHAR LIMIT=50] -->
<string name="default_active_sim_calls">calls</string>
<!-- Provider Model: summary of default SMS. [CHAR LIMIT=50] -->
<string name="default_active_sim_sms">SMS</string>
<!-- Provider Model: summary of default mobile data. [CHAR LIMIT=50] -->
<string name="default_active_sim_mobile_data">mobile data</string>
<!-- Summary text separator for preferences including a short description
(eg. "Connected / 5G"). [CHAR LIMIT=50] -->

50
res/xml/network_provider_sims_list.xml Normal file
View File

@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2021 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"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/provider_network_settings_title">
<PreferenceCategory
android:key="provider_model_sim_category"
android:title="@string/sim_category_title"
android:order="20"
settings:controller="com.android.settings.network.NetworkProviderSimsCategoryController"/>
<PreferenceCategory
android:key="provider_model_downloaded_sim_category"
android:title="@string/downloaded_sim_category_title"
android:order="25"
settings:controller=
"com.android.settings.network.NetworkProviderDownloadedSimsCategoryController"
settings:allowDividerAbove="true"/>
<com.android.settingslib.RestrictedPreference
android:key="add_more"
settings:isPreferenceVisible="false"
settings:userRestriction="no_config_mobile_networks"
settings:useAdminDisabledSummary="true"
settings:searchable="false"
android:title="@string/mobile_network_list_add_more"
android:icon="@drawable/ic_menu_add_activated_tint"
android:order="100">
<intent android:action="android.telephony.euicc.action.PROVISION_EMBEDDED_SUBSCRIPTION">
<extra android:name="android.telephony.euicc.extra.FORCE_PROVISION"
android:value="true"/>
</intent>
</com.android.settingslib.RestrictedPreference>
</PreferenceScreen>