Snap for 8677156 from 729c5d0487 to tm-release

Change-Id: I258f533824e0f4ef0a144eb654f35bbf21b9d486

res/values-af/arrays.xml

@@ -377,9 +377,9 @@
   </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Verstek"</item>
-    <item msgid="4234707448428002595">"Sans-serif"</item>
-    <item msgid="2390008695651897663">"Sans-serif gekondenseer"</item>
-    <item msgid="2396492419730702454">"Sans-serif-enkelspasie"</item>
+    <item msgid="4234707448428002595">"Sans Serif"</item>
+    <item msgid="2390008695651897663">"Sans Serif gekondenseer"</item>
+    <item msgid="2396492419730702454">"Sans Serif-enkelspasie"</item>
     <item msgid="8199675052804786099">"Serif"</item>
     <item msgid="4554123140736897688">"Serif-enkelspasie"</item>
     <item msgid="5485652650875486635">"Gemaklik"</item>

res/values-mr/arrays.xml

@@ -83,7 +83,7 @@
     <item msgid="286164147080824297">"डिस्कनेक्ट करत आहे..."</item>
     <item msgid="1628460745311787730">"डिस्कनेक्ट केले"</item>
     <item msgid="4013828218541488949">"अयशस्वी"</item>
-    <item msgid="5473541238056528086">"अवरोधित"</item>
+    <item msgid="5473541238056528086">"ब्लॉक केले"</item>
     <item msgid="1114588261171522603">"तात्पुरते खराब कनेक्शन टाळत आहे"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
@@ -97,7 +97,7 @@
     <item msgid="2595938203187002544">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वरून डिस्कनेक्ट करत आहे…"</item>
     <item msgid="2435175968703898648">"डिस्कनेक्ट केले"</item>
     <item msgid="4804573668906374228">"अयशस्वी"</item>
-    <item msgid="4036325515437530221">"अवरोधित"</item>
+    <item msgid="4036325515437530221">"ब्लॉक केले"</item>
     <item msgid="8883455894013518008">"तात्पुरते खराब कनेक्शन टाळत आहे"</item>
   </string-array>
     <!-- no translation found for wifi_tether_security:0 (6312112980634811065) -->

res/xml/location_services.xml

@@ -23,13 +23,13 @@
             android:layout="@layout/preference_category_no_label"
             settings:controller="com.android.settings.location.LocationInjectedServicesPreferenceController"/>
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:fragment="com.android.settings.location.WifiScanningFragment"
             android:key="location_services_wifi_scanning"
             android:title="@string/location_scanning_wifi_always_scanning_title"
             settings:controller="com.android.settings.location.LocationServicesWifiScanningPreferenceController"/>
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:fragment="com.android.settings.location.BluetoothScanningFragment"
             android:key="location_services_bluetooth_scanning"
             android:title="@string/location_scanning_bluetooth_always_scanning_title"

src/com/android/settings/location/LocationServicesBluetoothScanningPreferenceController.java

@@ -16,10 +16,14 @@
 package com.android.settings.location;
 
 import android.content.Context;
+import android.os.UserManager;
 import android.provider.Settings;
 
+import androidx.preference.Preference;
+
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.RestrictedPreference;
 
 /**
  * Preference controller for Bluetooth scanning in Location Services.
@@ -31,6 +35,13 @@ public class LocationServicesBluetoothScanningPreferenceController extends
         super(context, key);
     }
 
+    @Override
+    public void updateState(Preference preference) {
+        ((RestrictedPreference) preference).checkRestrictionAndSetDisabled(
+                UserManager.DISALLOW_CONFIG_LOCATION);
+        refreshSummary(preference);
+    }
+
     @Override
     public CharSequence getSummary() {
         final boolean bleScanOn = Settings.Global.getInt(mContext.getContentResolver(),

src/com/android/settings/location/LocationServicesWifiScanningPreferenceController.java

@@ -17,9 +17,13 @@ package com.android.settings.location;
 
 import android.content.Context;
 import android.net.wifi.WifiManager;
+import android.os.UserManager;
+
+import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.RestrictedPreference;
 
 /**
  * Preference controller for Wi-Fi scanning in Location Services.
@@ -33,6 +37,13 @@ public class LocationServicesWifiScanningPreferenceController extends BasePrefer
         mWifiManager = context.getSystemService(WifiManager.class);
     }
 
+    @Override
+    public void updateState(Preference preference) {
+        ((RestrictedPreference) preference).checkRestrictionAndSetDisabled(
+                UserManager.DISALLOW_CONFIG_LOCATION);
+        refreshSummary(preference);
+    }
+
     @Override
     public CharSequence getSummary() {
         final boolean wifiScanOn = mWifiManager.isScanAlwaysAvailable();

src/com/android/settings/nfc/SecureNfcPreferenceController.java

@@ -17,6 +17,7 @@ package com.android.settings.nfc;
 
 import android.content.Context;
 import android.nfc.NfcAdapter;
+import android.os.UserManager;
 
 import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
@@ -32,10 +33,12 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
 
     private final NfcAdapter mNfcAdapter;
     private SecureNfcEnabler mSecureNfcEnabler;
+    private final UserManager mUserManager;
 
     public SecureNfcPreferenceController(Context context, String key) {
         super(context, key);
         mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
+        mUserManager = context.getSystemService(UserManager.class);
     }
 
     @Override
@@ -58,7 +61,11 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        return mNfcAdapter.enableSecureNfc(isChecked);
+        if (isToggleable()) {
+            return mNfcAdapter.enableSecureNfc(isChecked);
+        } else {
+            return false;
+        }
     }
 
     @Override
@@ -100,4 +107,12 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
             mSecureNfcEnabler.pause();
         }
     }
+
+    private boolean isToggleable() {
+        if (mUserManager.isGuestUser()) {
+            return false;
+        }
+        return true;
+    }
+
 }