PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main

Browse Source
This commit is contained in:
Bill Yi
2023-07-12 13:38:40 +00:00
committed by Gerrit Code Review
parent 65c31baf7f 05c15f8e73
commit d4c0315d66
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.location;
import android.content.Context; import android.content.Context;
import android.provider.Settings; import android.provider.Settings;
import android.widget.Switch; import android.widget.Switch;
import android.os.UserManager;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -33,9 +34,11 @@ public class BluetoothScanningMainSwitchPreferenceController extends TogglePrefe
implements OnMainSwitchChangeListener { implements OnMainSwitchChangeListener {
private static final String KEY_BLUETOOTH_SCANNING_SWITCH = "bluetooth_always_scanning_switch"; private static final String KEY_BLUETOOTH_SCANNING_SWITCH = "bluetooth_always_scanning_switch";
private final UserManager mUserManager;
public BluetoothScanningMainSwitchPreferenceController(Context context) { public BluetoothScanningMainSwitchPreferenceController(Context context) {
super(context, KEY_BLUETOOTH_SCANNING_SWITCH); super(context, KEY_BLUETOOTH_SCANNING_SWITCH);
mUserManager = UserManager.get(context);
} }
@Override @Override
@@ -49,7 +52,9 @@ public class BluetoothScanningMainSwitchPreferenceController extends TogglePrefe
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(R.bool.config_show_location_scanning) return mContext.getResources().getBoolean(R.bool.config_show_location_scanning)
? AVAILABLE ? (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_LOCATION)
? DISABLED_DEPENDENT_SETTING
: AVAILABLE)
: UNSUPPORTED_ON_DEVICE; : UNSUPPORTED_ON_DEVICE;
} }

7
src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.location;
import android.content.Context; import android.content.Context;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.widget.Switch; import android.widget.Switch;
import android.os.UserManager;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -34,10 +35,12 @@ public class WifiScanningMainSwitchPreferenceController extends TogglePreference
private static final String KEY_WIFI_SCANNING_SWITCH = "wifi_always_scanning_switch"; private static final String KEY_WIFI_SCANNING_SWITCH = "wifi_always_scanning_switch";
private final WifiManager mWifiManager; private final WifiManager mWifiManager;
private final UserManager mUserManager;
public WifiScanningMainSwitchPreferenceController(Context context) { public WifiScanningMainSwitchPreferenceController(Context context) {
super(context, KEY_WIFI_SCANNING_SWITCH); super(context, KEY_WIFI_SCANNING_SWITCH);
mWifiManager = context.getSystemService(WifiManager.class); mWifiManager = context.getSystemService(WifiManager.class);
mUserManager = UserManager.get(context);
} }
@Override @Override
@@ -52,7 +55,9 @@ public class WifiScanningMainSwitchPreferenceController extends TogglePreference
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(R.bool.config_show_location_scanning) return mContext.getResources().getBoolean(R.bool.config_show_location_scanning)
? AVAILABLE ? (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_LOCATION)
? DISABLED_DEPENDENT_SETTING
: AVAILABLE)
: UNSUPPORTED_ON_DEVICE; : UNSUPPORTED_ON_DEVICE;
} }