Correct the data usage warning

- For MATCH_WIFI, only shown non carrier warning when has SIM
- For others, restore the previous operator warning

Bug: 331184249
Test: manual - on DataUsageList
Change-Id: I5d5c6b36c6874a547cc635c025aa77acadf6e1e3
This commit is contained in:
Chaohui Wang
2024-04-02 17:13:04 +08:00
parent a6289cddd9
commit 00c21da30e
4 changed files with 81 additions and 5 deletions

View File

@@ -10142,6 +10142,9 @@
<!-- Format for a summary describing the amount of data before the user is warned or limited [CHAR LIMIT=NONE] -->
<string name="cell_data_warning_and_limit"><xliff:g name="amount" example="1 GB">^1</xliff:g> data warning / <xliff:g name="amount" example="2 GB">^2</xliff:g> data limit</string>
<!-- A summary shown on data usage screens to indicate inaccuracy of data tracking [CHAR LIMIT=NONE] -->
<string name="operator_warning">Carrier data accounting may differ from device accounting</string>
<!-- A summary shown on data usage screens to indicate data tracking excluded from carrier networks [CHAR LIMIT=NONE] -->
<string name="non_carrier_data_usage_warning">Excludes data used by carrier networks</string>

View File

@@ -27,8 +27,7 @@
/>
<Preference
android:key="non_carrier_data_usage_warning"
android:summary="@string/non_carrier_data_usage_warning"
android:key="warning"
android:selectable="false" />
</PreferenceCategory>