Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index 3e8153e..70de30f 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -276,7 +276,7 @@
<item msgid="6454031639780101439">"VPN সক্ৰিয় কৰক"</item>
<item msgid="2441327072846850561">"ৱালপেপাৰ লিখক"</item>
<item msgid="2162456889277589861">"সহায়ৰ গাঁঠনি"</item>
- <item msgid="4644645617399271070">"সহায়ক স্ক্ৰীণশ্বট"</item>
+ <item msgid="4644645617399271070">"সহায়ক স্ক্ৰীনশ্বট"</item>
<item msgid="8321845997769724385">"ফ\'নৰ স্থিতি পঢ়ক"</item>
<item msgid="8319500905789302082">"ভইচমেইল যোগ কৰক"</item>
<item msgid="1745447762712473288">"ছিপ ব্যৱহাৰ কৰক"</item>
@@ -343,7 +343,7 @@
<item msgid="3904996949561946108">"ভিপিএন সক্ৰিয় কৰক"</item>
<item msgid="504052124101832515">"ৱালপেপাৰ যোৰ দিয়ক"</item>
<item msgid="1657182386933187909">"সহায়ৰ গাঁথনি"</item>
- <item msgid="437655393941385937">"সহায় স্ক্ৰীণশ্বট"</item>
+ <item msgid="437655393941385937">"সহায় স্ক্ৰীনশ্বট"</item>
<item msgid="973363520315356844">"ফ\'নৰ স্থিতি পঢ়ক"</item>
<item msgid="1203157739257425062">"ভইচমেইল যোগ কৰক"</item>
<item msgid="9143978647977300187">"ছিপ ব্যৱহাৰ কৰক"</item>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 9da66a2..6696971 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -261,7 +261,7 @@
<item msgid="3843484466100107397">"priorité audio"</item>
<item msgid="617344340943430125">"volume général"</item>
<item msgid="1249691739381713634">"volume de la voix"</item>
- <item msgid="6485000384018554920">"volume des sonneries"</item>
+ <item msgid="6485000384018554920">"volume de la sonnerie"</item>
<item msgid="3378000878531336372">"volume des contenus multimédias"</item>
<item msgid="5272927168355895681">"volume des alarmes"</item>
<item msgid="4422070755065530548">"volume des notifications"</item>
@@ -329,8 +329,8 @@
<item msgid="745291221457314879">"Volume général"</item>
<item msgid="4722479281326245754">"Volume de la voix"</item>
<item msgid="6749550886745567276">"Volume de la sonnerie"</item>
- <item msgid="2218685029915863168">"Volume des contenus multimédias"</item>
- <item msgid="4266577290496513640">"Volume de l\'alarme"</item>
+ <item msgid="2218685029915863168">"Volume du contenu multimédia"</item>
+ <item msgid="4266577290496513640">"Volume des alarmes"</item>
<item msgid="8608084169623998854">"Volume des notifications"</item>
<item msgid="7948784184567841794">"Volume Bluetooth"</item>
<item msgid="1148968792599973150">"Maintenir activé"</item>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index db045a6..d44a0c3 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -290,7 +290,7 @@
<item msgid="2504191192460059817">"ಸ್ಕ್ರೀನ್ ಆನ್ ಮಾಡಿ"</item>
<item msgid="7905819538788103556">"ಖಾತೆಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳಿ"</item>
<item msgid="1675025662248079254">"ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಮಾಡಿ"</item>
- <item msgid="2553974920157061225">"ಪ್ರವೇಶಿಸುವಿಕೆ ವಾಲ್ಯೂಮ್"</item>
+ <item msgid="2553974920157061225">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ವಾಲ್ಯೂಮ್"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="7780927354556651567">"ಸ್ಥಳ"</item>
@@ -357,7 +357,7 @@
<item msgid="4281352581602735717">"ಸ್ಕ್ರೀನ್ ಆನ್ ಮಾಡಿ"</item>
<item msgid="346122795998225472">"ಖಾತೆಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳಿ"</item>
<item msgid="3756073389408535680">"ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಮಾಡಿ"</item>
- <item msgid="2114661179947426734">"ಪ್ರವೇಶಿಸುವಿಕೆ ವಾಲ್ಯೂಮ್"</item>
+ <item msgid="2114661179947426734">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ವಾಲ್ಯೂಮ್"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="6926391290986427331">"ಕಡಿಮೆ"</item>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index e101766..dbe53f4 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -290,7 +290,7 @@
<item msgid="2504191192460059817">"vklop zaslona"</item>
<item msgid="7905819538788103556">"pridobivanje računov"</item>
<item msgid="1675025662248079254">"izvajanje v ozadju"</item>
- <item msgid="2553974920157061225">"glasnost za funkcije za ljudi s posebnimi potrebami"</item>
+ <item msgid="2553974920157061225">"glasnost za dostopnost"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="7780927354556651567">"Lokacija"</item>
@@ -357,7 +357,7 @@
<item msgid="4281352581602735717">"Vklop zaslona"</item>
<item msgid="346122795998225472">"Pridobivanje računov"</item>
<item msgid="3756073389408535680">"Izvajanje v ozadju"</item>
- <item msgid="2114661179947426734">"Glasnost za funkcije za ljudi s posebnimi potrebami"</item>
+ <item msgid="2114661179947426734">"Glasnost za dostopnost"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="6926391290986427331">"Kratko"</item>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 6146f83..89195c4 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -214,7 +214,7 @@
<item msgid="3441876902463317017">"GID"</item>
</string-array>
<string-array name="app_install_location_entries">
- <item msgid="3771157789865587832">"అంతర్గత పరికర నిల్వ"</item>
+ <item msgid="3771157789865587832">"అంతర్గత పరికర స్టోరేజ్"</item>
<item msgid="5501345333507193420">"తీసివేయదగిన SD కార్డు"</item>
<item msgid="2362840341195111674">"సిస్టమ్ నిర్ణయించుకునేలా అనుమతించండి"</item>
</string-array>
@@ -286,7 +286,7 @@
<item msgid="8163066895749904470">"సెల్ ప్రసారాలను చదవడం"</item>
<item msgid="7621394050624063528">"డమ్మీ లొకేషన్"</item>
<item msgid="37519917674959757">"నిల్వను చదవడం"</item>
- <item msgid="3868809525697401379">"నిల్వలో రాయడం"</item>
+ <item msgid="3868809525697401379">"స్టోరేజ్లో రాయడం"</item>
<item msgid="2504191192460059817">"స్క్రీన్ను ఆన్ చేయడం"</item>
<item msgid="7905819538788103556">"ఖాతాలను పొందడం"</item>
<item msgid="1675025662248079254">"బ్యాక్గ్రౌండ్లో అమలు చేయడం"</item>
@@ -353,7 +353,7 @@
<item msgid="2546206711741159825">"సెల్ ప్రసారాలను చదవడం"</item>
<item msgid="2363460595607829243">"డమ్మీ లొకేషన్"</item>
<item msgid="3778165903878569143">"నిల్వను చదవడం"</item>
- <item msgid="555939881912035315">"నిల్వలో రాయడం"</item>
+ <item msgid="555939881912035315">"స్టోరేజ్లో రాయడం"</item>
<item msgid="4281352581602735717">"స్క్రీన్ను ఆన్ చేయడం"</item>
<item msgid="346122795998225472">"ఖాతాలను పొందడం"</item>
<item msgid="3756073389408535680">"బ్యాక్గ్రౌండ్లో అమలు చేయడం"</item>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index a5ca051..66e22ba 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -357,7 +357,7 @@
<item msgid="4281352581602735717">"Ekranni yoqish"</item>
<item msgid="346122795998225472">"Hisoblarni olish"</item>
<item msgid="3756073389408535680">"Fonda ishga tushirish"</item>
- <item msgid="2114661179947426734">"Maxsus imkoniyatlar ovozi balandligi"</item>
+ <item msgid="2114661179947426734">"Qulayliklar ovozi balandligi"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="6926391290986427331">"Qisqa"</item>
@@ -515,7 +515,7 @@
<item msgid="3761390980253394079">"Kunduzgi"</item>
</string-array>
<string-array name="autofill_logging_level_entries">
- <item msgid="2263571982739726576">"Yoqilmagan"</item>
+ <item msgid="2263571982739726576">"Oʻchiq"</item>
<item msgid="4295717421282345505">"Tuzatish"</item>
<item msgid="8657797891533816070">"Batafsil"</item>
</string-array>
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettings.java b/src/com/android/settings/wifi/calling/WifiCallingSettings.java
index b4951bf..b15f33f 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSettings.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSettings.java
@@ -20,13 +20,16 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+import android.os.UserHandle;
import android.provider.Settings;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
+import android.util.EventLog;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.view.ViewStub;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
@@ -39,6 +42,7 @@
import com.android.settings.network.ActiveSubscriptionsListener;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.ims.WifiCallingQueryImsState;
+import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.search.actionbar.SearchMenuController;
import com.android.settings.support.actionbar.HelpResourceProvider;
import com.android.settings.widget.RtlCompatibleViewPager;
@@ -92,6 +96,9 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
+ if (MobileNetworkUtils.isMobileNetworkUserRestricted(getActivity())) {
+ return new ViewStub(getActivity());
+ }
final View view = inflater.inflate(R.layout.wifi_calling_settings_tabs, container, false);
mTabLayout = view.findViewById(R.id.sliding_tabs);
@@ -138,6 +145,12 @@
public void onCreate(Bundle icicle) {
mConstructionSubId = getConstructionSubId(icicle);
super.onCreate(icicle);
+ if (MobileNetworkUtils.isMobileNetworkUserRestricted(getActivity())) {
+ Log.e(TAG, "This setting isn't available due to user restriction.");
+ EventLog.writeEvent(0x534e4554, "262243015", UserHandle.myUserId(), "User restricted");
+ finish();
+ return;
+ }
Log.d(TAG, "SubId=" + mConstructionSubId);
if (mConstructionSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {