Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 5c46116..7887d4a 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -215,7 +215,7 @@
<item msgid="3441876902463317017">"GID"</item>
</string-array>
<string-array name="app_install_location_entries">
- <item msgid="3771157789865587832">"Interna pohrana uređaja"</item>
+ <item msgid="3771157789865587832">"Unutrašnja pohrana uređaja"</item>
<item msgid="5501345333507193420">"Izmjenjiva SD kartica"</item>
<item msgid="2362840341195111674">"Neka sistem odluči"</item>
</string-array>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 4c32e97..e1b59f2 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -491,7 +491,7 @@
<string-array name="wifi_metered_entries">
<item msgid="3237321077949659241">"Automatisch erkennen"</item>
<item msgid="3779092145391320375">"Wie \"kostenpflichtig\" behandeln"</item>
- <item msgid="2047166446768045816">"Wie \"kostenlos\" behandeln"</item>
+ <item msgid="2047166446768045816">"Wie \"ohne Datenlimit\" behandeln"</item>
</string-array>
<string-array name="wifi_privacy_entries">
<item msgid="3485945604919292489">"Zufällige MAC-Adresse verwenden (Standard)"</item>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index 290c61f..4a25f9e 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -429,7 +429,7 @@
</string-array>
<string-array name="vpn_states">
<item msgid="2262719249581510939">"डिस्कनेक्ट केले"</item>
- <item msgid="9141074028293812365">"प्रारंभ करत आहे…"</item>
+ <item msgid="9141074028293812365">"सुरू करत आहे…"</item>
<item msgid="2234425878608626285">"कनेक्ट करत आहे..."</item>
<item msgid="27547778933579155">"कनेक्ट केले"</item>
<item msgid="893506841727300393">"टाइमआउट"</item>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index 98322c6..e057938 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -437,7 +437,7 @@
</string-array>
<string-array name="security_settings_premium_sms_values">
<item msgid="3985605994234635072">"So‘rash"</item>
- <item msgid="2358187544264718285">"Hech qachon ruxsat berilmasin"</item>
+ <item msgid="2358187544264718285">"Ruxsat berilmasin"</item>
<item msgid="7043782324123900484">"Har doim ruxsat berilsin"</item>
</string-array>
<string-array name="ram_states">
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 61f0ad6..9b54e3b 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -228,7 +228,8 @@
if (mSubscriptionInfo == null) {
return;
}
-
+ mTelephonyManager =
+ mTelephonyManager.createForSubscriptionId(mSubscriptionInfo.getSubscriptionId());
mPhoneStateListener = getPhoneStateListener();
updateLatestAreaInfo();
updateSubscriptionStatus();
diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
index 7f7dc3a..c0a9d31 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
@@ -81,7 +81,7 @@
mCurSubscriptionId = updateSubscriptionIndex;
mFragmentForceReload = (mCurSubscriptionId == oldSubId);
final SubscriptionInfo info = getSubscription();
- updateSubscriptions(info);
+ updateSubscriptions(info, null);
// If the subscription has changed or the new intent doesnt contain the opt in action,
// remove the old discovery dialog. If the activity is being recreated, we will see
@@ -132,7 +132,7 @@
// perform registration after mCurSubscriptionId been configured.
registerActiveSubscriptionsListener();
- updateSubscriptions(subscription);
+ updateSubscriptions(subscription, savedInstanceState);
}
@VisibleForTesting
@@ -154,7 +154,7 @@
public void onChanged() {
SubscriptionInfo info = getSubscription();
int oldSubIndex = mCurSubscriptionId;
- updateSubscriptions(info);
+ updateSubscriptions(info, null);
// Remove the dialog if the subscription associated with this activity changes.
if (info == null) {
@@ -204,14 +204,16 @@
}
@VisibleForTesting
- void updateSubscriptions(SubscriptionInfo subscription) {
+ void updateSubscriptions(SubscriptionInfo subscription, Bundle savedInstanceState) {
if (subscription == null) {
return;
}
final int subscriptionIndex = subscription.getSubscriptionId();
updateTitleAndNavigation(subscription);
- switchFragment(subscription);
+ if (savedInstanceState == null) {
+ switchFragment(subscription);
+ }
mCurSubscriptionId = subscriptionIndex;
mFragmentForceReload = false;
diff --git a/src/com/android/settings/wifi/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java
index 024dc10..9d50281 100644
--- a/src/com/android/settings/wifi/WifiScanModeActivity.java
+++ b/src/com/android/settings/wifi/WifiScanModeActivity.java
@@ -25,6 +25,7 @@
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.text.TextUtils;
+import android.view.WindowManager;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
@@ -43,6 +44,8 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ getWindow().addSystemFlags(
+ WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
Intent intent = getIntent();
if (savedInstanceState == null) {
if (intent != null && WifiManager.ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
index a854c04..106d210 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -162,6 +162,8 @@
doReturn(null).when(mSignalStrength).getCellSignalStrengths();
doReturn(mPhoneStateListener).when(mController).getPhoneStateListener();
doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(anyInt());
+ when(mSubscriptionInfo.getSubscriptionId())
+ .thenReturn(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
ReflectionHelpers.setField(mController, "mCarrierConfigManager", mCarrierConfigManager);