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

Merge "Use FAST_PAIR_SCAN_ENABLED in Nearby Manager" into tm-dev

Browse Source
This commit is contained in:
Xinyi Zhou
2022-03-09 19:25:52 +00:00
committed by Android (Google) Code Review
parent b166e75474 e8d3c4290a
commit 37e36825a3
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/nearby/FastPairSettingsFragment.java
View File

@@ -21,6 +21,7 @@ import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.nearby.NearbyManager;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
@@ -56,9 +57,9 @@ public class FastPairSettingsFragment extends SettingsPreferenceFragment {
findPreference(SCAN_SWITCH_KEY)); findPreference(SCAN_SWITCH_KEY));
mainSwitchPreference.addOnSwitchChangeListener( mainSwitchPreference.addOnSwitchChangeListener(
(switchView, isChecked) -> (switchView, isChecked) ->
Settings.Secure.putInt(getContentResolver(), NearbyManager.setFastPairScanEnabled(getContext(), isChecked));
Settings.Secure.FAST_PAIR_SCAN_ENABLED, isChecked ? 1 : 0)); mainSwitchPreference.setChecked(
mainSwitchPreference.setChecked(isFastPairScanAvailable()); NearbyManager.getFastPairScanEnabled(getContext(), false));
Preference savedDevicePref = Objects.requireNonNull( Preference savedDevicePref = Objects.requireNonNull(
findPreference(SAVED_DEVICES_PREF_KEY)); findPreference(SAVED_DEVICES_PREF_KEY));
@@ -89,11 +90,6 @@ public class FastPairSettingsFragment extends SettingsPreferenceFragment {
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.fast_pair_settings); new BaseSearchIndexProvider(R.xml.fast_pair_settings);
private boolean isFastPairScanAvailable() {
return Settings.Secure.getInt(getContentResolver(),
Settings.Secure.FAST_PAIR_SCAN_ENABLED, 1) != 0;
}
@Nullable @Nullable
private ComponentName getSavedDevicesComponent() { private ComponentName getSavedDevicesComponent() {
String savedDevicesComponent = Settings.Secure.getString( String savedDevicesComponent = Settings.Secure.getString(