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

Add back Fast Pair MainSwitch logic

Browse Source 
Bug: 203579197
Test: -m
Change-Id: I861ece6cf6dd50c982fccc56f84f63243120e250
This commit is contained in:
Xinyi Zhou
2022-08-04 15:02:16 -07:00
parent cdbf53761d
commit 827267dc69
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
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;
@@ -34,6 +35,7 @@ import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.widget.MainSwitchPreference; import com.android.settingslib.widget.MainSwitchPreference;
import com.android.settingslib.widget.OnMainSwitchChangeListener;
import java.util.Objects; import java.util.Objects;
@@ -48,14 +50,17 @@ public class FastPairSettingsFragment extends SettingsPreferenceFragment {
private static final String SCAN_SWITCH_KEY = "fast_pair_scan_switch"; private static final String SCAN_SWITCH_KEY = "fast_pair_scan_switch";
private static final String SAVED_DEVICES_PREF_KEY = "saved_devices"; private static final String SAVED_DEVICES_PREF_KEY = "saved_devices";
private MainSwitchPreference mMainSwitchPreference;
private OnMainSwitchChangeListener mMainSwitchChangeListener;
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
MainSwitchPreference mainSwitchPreference = Objects.requireNonNull( mMainSwitchPreference = Objects.requireNonNull(
findPreference(SCAN_SWITCH_KEY)); findPreference(SCAN_SWITCH_KEY));
mainSwitchPreference.setChecked(false); mMainSwitchChangeListener = (switchView, isChecked) ->
NearbyManager.setFastPairScanEnabled(getContext(), isChecked);
Preference savedDevicePref = Objects.requireNonNull( Preference savedDevicePref = Objects.requireNonNull(
findPreference(SAVED_DEVICES_PREF_KEY)); findPreference(SAVED_DEVICES_PREF_KEY));
savedDevicePref.setOnPreferenceClickListener(preference -> { savedDevicePref.setOnPreferenceClickListener(preference -> {
@@ -67,6 +72,19 @@ public class FastPairSettingsFragment extends SettingsPreferenceFragment {
}); });
} }
@Override
public void onResume() {
super.onResume();
mMainSwitchPreference.addOnSwitchChangeListener(mMainSwitchChangeListener);
mMainSwitchPreference.setChecked(NearbyManager.isFastPairScanEnabled(getContext()));
}
@Override
public void onPause() {
super.onPause();
mMainSwitchPreference.removeOnSwitchChangeListener(mMainSwitchChangeListener);
}
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
return SettingsEnums.CONNECTION_DEVICE_ADVANCED_FAST_PAIR; return SettingsEnums.CONNECTION_DEVICE_ADVANCED_FAST_PAIR;