Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 2f727e8..7e096c1 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -533,7 +533,7 @@
<item msgid="6691772120712000966">"Automatski"</item>
</string-array>
<string-array name="preferred_network_mode_choices">
- <item msgid="5746729990546256950">"Preferiraj GSM/WCDMA"</item>
+ <item msgid="5746729990546256950">"Preferira se GSM/WCDMA"</item>
<item msgid="6443811977675152844">"Samo GSM"</item>
<item msgid="8767554719068876877">"Samo WCDMA"</item>
<item msgid="928773614806830223">"Automatski GSM/WCDMA"</item>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index ef27022..e7949f5 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -476,7 +476,7 @@
<item msgid="5777152116210127847">"शीर्ष गतिविधि"</item>
<item msgid="1834030155560727324">"महत्वपूर्ण (अग्रभाग)"</item>
<item msgid="8494424742994426350">"महत्वपूर्ण (पृष्ठभूमि)"</item>
- <item msgid="5099332663422156149">"बैकअप"</item>
+ <item msgid="5099332663422156149">"बैक अप"</item>
<item msgid="7701089238529887617">"अत्यधिक"</item>
<item msgid="3006466648960525485">"सेवा (चल रही है)"</item>
<item msgid="2253476667031759713">"सेवा (फिर से प्रारंभ हो रही है)"</item>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 3ac22e9..b8c5ad0 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -276,7 +276,7 @@
<item msgid="317746827951691657">"టోస్ట్‌ను చూపడం"</item>
<item msgid="5679422988212309779">"మీడియాను ప్రొజెక్ట్ చేయడం"</item>
<item msgid="6454031639780101439">"VPNని సక్రియం చేయడం"</item>
- <item msgid="2441327072846850561">"వాల్‌పేపర్ వ్రాయడం"</item>
+ <item msgid="2441327072846850561">"వాల్‌పేపర్ రాయడం"</item>
<item msgid="2162456889277589861">"నిర్మాణంలో సహాయం"</item>
<item msgid="4644645617399271070">"స్క్రీన్‌షాట్‌కు సహాయం"</item>
<item msgid="8321845997769724385">"ఫోన్ స్థితిని చదవడం"</item>
@@ -288,7 +288,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>
@@ -343,7 +343,7 @@
<item msgid="4000577305179914546">"టోస్ట్‌ను చూపడం"</item>
<item msgid="8660207174515570558">"మీడియాని ప్రొజెక్ట్ చేయడం"</item>
<item msgid="3904996949561946108">"VPNని సక్రియం చేయడం"</item>
- <item msgid="504052124101832515">"వాల్‌పేపర్‌ను వ్రాయడం"</item>
+ <item msgid="504052124101832515">"వాల్‌పేపర్‌ను రాయడం"</item>
<item msgid="1657182386933187909">"నిర్మాణంలో సహాయం"</item>
<item msgid="437655393941385937">"స్క్రీన్‌షాట్‌కు సహాయం"</item>
<item msgid="973363520315356844">"ఫోన్ స్థితిని చదవడం"</item>
@@ -355,7 +355,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/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index ab1c437..1a21b55 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -55,6 +55,7 @@
import com.android.settings.datausage.DataSaverBackend;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.wifi.tether.WifiTetherPreferenceController;
+import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.TetherUtil;
import com.android.settingslib.search.SearchIndexable;
@@ -425,14 +426,16 @@
private void updateUsbPreference() {
boolean usbAvailable = mUsbConnected && !mMassStorageActive;
+ final RestrictedLockUtils.EnforcedAdmin enforcedAdmin =
+ checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId());
- if (usbAvailable) {
+ if (enforcedAdmin != null) {
+ mUsbTether.setDisabledByAdmin(enforcedAdmin);
+ } else if (usbAvailable) {
mUsbTether.setEnabled(!mDataSaverEnabled);
} else {
mUsbTether.setEnabled(false);
}
- mUsbTether.setDisabledByAdmin(
- checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId()));
}
@VisibleForTesting
diff --git a/src/com/android/settings/network/ProviderModelSliceHelper.java b/src/com/android/settings/network/ProviderModelSliceHelper.java
index 32a475a..d264fd6 100644
--- a/src/com/android/settings/network/ProviderModelSliceHelper.java
+++ b/src/com/android/settings/network/ProviderModelSliceHelper.java
@@ -140,7 +140,7 @@
numLevels += 1;
}
return MobileNetworkUtils.getSignalStrengthIcon(mContext, level, numLevels,
- NO_CELL_DATA_TYPE_ICON, false);
+ NO_CELL_DATA_TYPE_ICON, !mTelephonyManager.isDataEnabled());
}
/**
diff --git a/src/com/android/settings/network/SubscriptionsPreferenceController.java b/src/com/android/settings/network/SubscriptionsPreferenceController.java
index 8e9e946..36c55e2 100644
--- a/src/com/android/settings/network/SubscriptionsPreferenceController.java
+++ b/src/com/android/settings/network/SubscriptionsPreferenceController.java
@@ -311,7 +311,8 @@
numLevels += 1;
}
- Drawable icon = mSubsPrefCtrlInjector.getIcon(mContext, level, numLevels, false);
+ Drawable icon = mSubsPrefCtrlInjector.getIcon(mContext, level, numLevels,
+ !mTelephonyManager.isDataEnabled());
final boolean isActiveCellularNetwork =
mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext);
if (isActiveCellularNetwork || (mWifiPickerTrackerHelper != null)
diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
index 7d43230..d06426d 100644
--- a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
+++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
@@ -224,8 +224,9 @@
public void getMobileDrawable_noCarrierData_getMobileDrawable() throws Throwable {
mockConnections(false, ServiceState.STATE_OUT_OF_SERVICE, "",
false, true);
- when(mConnectivityManager.getActiveNetwork()).thenReturn(null);
Drawable expectDrawable = mock(Drawable.class);
+ when(mConnectivityManager.getActiveNetwork()).thenReturn(null);
+ when(mTelephonyManager.isDataEnabled()).thenReturn(false);
assertThat(mProviderModelSliceHelper.getMobileDrawable(expectDrawable)).isEqualTo(
expectDrawable);
@@ -236,8 +237,9 @@
throws Throwable {
mockConnections(true, ServiceState.STATE_IN_SERVICE, "", true,
true);
- addNetworkTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
Drawable drawable = mock(Drawable.class);
+ addNetworkTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
+ when(mTelephonyManager.isDataEnabled()).thenReturn(true);
assertThat(mProviderModelSliceHelper.getMobileDrawable(drawable)).isEqualTo(
mDrawableWithSignalStrength);
@@ -252,6 +254,7 @@
true);
Drawable drawable = mock(Drawable.class);
addNetworkTransportType(NetworkCapabilities.TRANSPORT_WIFI);
+ when(mTelephonyManager.isDataEnabled()).thenReturn(true);
assertThat(mProviderModelSliceHelper.getMobileDrawable(drawable)).isEqualTo(
mDrawableWithSignalStrength);
diff --git a/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
index cb78d19..7cffb76 100644
--- a/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
@@ -665,6 +665,7 @@
doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
Drawable icon = mock(Drawable.class);
+ when(mTelephonyManager.isDataEnabled()).thenReturn(true);
doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));
setupGetIconConditions(sub.get(0).getSubscriptionId(), true, true,
true, ServiceState.STATE_IN_SERVICE);
@@ -683,6 +684,7 @@
doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
doReturn(subs.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
Drawable icon = mock(Drawable.class);
+ when(mTelephonyManager.isDataEnabled()).thenReturn(true);
doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));
setupGetIconConditions(subId, false, true,
true, ServiceState.STATE_IN_SERVICE);
@@ -701,7 +703,8 @@
doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
doReturn(subs.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
Drawable icon = mock(Drawable.class);
- doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));
+ when(mTelephonyManager.isDataEnabled()).thenReturn(false);
+ doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(true));
setupGetIconConditions(subId, false, false,
false, ServiceState.STATE_IN_SERVICE);