Add recommendation setting and remove app settings

- Add a new setting to control whether smartspace recommendations are
enabled
- Remove setting to block individual apps from resumption
- Update strings for existing resume setting

Bug: 187925818
Test: atest SettingsProviderTest
Test: atest MediaControlsRecommendationControllerTest
Test: atest MediaControlsPreferenceControllerTest
Change-Id: I4bd6a420e01e8c44f4db8be477557501648cc8d7
This commit is contained in:
Beth Thibodeau
2021-05-25 15:09:02 -04:00
parent c102420acb
commit b7993699ba
8 changed files with 171 additions and 357 deletions

View File

@@ -20,47 +20,34 @@ import static android.provider.Settings.Secure.MEDIA_CONTROLS_RESUME;
import android.content.Context;
import android.provider.Settings;
import android.widget.Switch;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.widget.SettingsMainSwitchPreference;
import com.android.settingslib.widget.OnMainSwitchChangeListener;
import com.android.settings.core.TogglePreferenceController;
/**
* Toggle for media controls settings
* Toggle for media controls resumption setting
*/
public class MediaControlsPreferenceController extends BasePreferenceController
implements OnMainSwitchChangeListener {
public class MediaControlsPreferenceController extends TogglePreferenceController {
public MediaControlsPreferenceController(Context context, String key) {
super(context, key);
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
SettingsMainSwitchPreference mainSwitch = screen.findPreference(mPreferenceKey);
mainSwitch.addOnSwitchChangeListener(this);
mainSwitch.setChecked(isChecked());
}
@VisibleForTesting
protected boolean isChecked() {
public boolean isChecked() {
int val = Settings.Secure.getInt(mContext.getContentResolver(), MEDIA_CONTROLS_RESUME, 1);
return val == 1;
}
@Override
public boolean setChecked(boolean isChecked) {
int val = isChecked ? 1 : 0;
return Settings.Secure.putInt(mContext.getContentResolver(), MEDIA_CONTROLS_RESUME, val);
}
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
}
@Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
int val = isChecked ? 1 : 0;
Settings.Secure.putInt(mContext.getContentResolver(), MEDIA_CONTROLS_RESUME, val);
}
}