Deprecate AppListPreference and AppListPrefWithSettings
- Convert ManageAssist into DashboardFragment - Convert default assist pref to DefaultAppPickerFragment - Add PreferenceController for each pref - Add tests Bug: 35203386 Test: make RunSettingsRoboTests Change-Id: I0350a06cae7457809fb261e2d8ec99eda80cc50a
This commit is contained in:
@@ -0,0 +1,158 @@
|
||||
/*
|
||||
* Copyright (C) 2017 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.applications.assist;
|
||||
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.net.Uri;
|
||||
import android.os.UserHandle;
|
||||
import android.provider.Settings;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
import android.support.v7.preference.TwoStatePreference;
|
||||
|
||||
import com.android.internal.annotations.VisibleForTesting;
|
||||
import com.android.internal.app.AssistUtils;
|
||||
import com.android.settings.core.PreferenceController;
|
||||
import com.android.settings.core.lifecycle.Lifecycle;
|
||||
import com.android.settings.core.lifecycle.LifecycleObserver;
|
||||
import com.android.settings.core.lifecycle.events.OnPause;
|
||||
import com.android.settings.core.lifecycle.events.OnResume;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
public class AssistFlashScreenPreferenceController extends PreferenceController
|
||||
implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
|
||||
|
||||
private static final String KEY_FLASH = "flash";
|
||||
|
||||
private final AssistUtils mAssistUtils;
|
||||
private final SettingObserver mSettingObserver;
|
||||
private PreferenceScreen mScreen;
|
||||
private Preference mPreference;
|
||||
|
||||
public AssistFlashScreenPreferenceController(Context context, Lifecycle lifecycle) {
|
||||
super(context);
|
||||
mAssistUtils = new AssistUtils(context);
|
||||
mSettingObserver = new SettingObserver();
|
||||
|
||||
if (lifecycle != null) {
|
||||
lifecycle.addObserver(this);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return getCurrentAssist() != null && allowDisablingAssistDisclosure();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPreferenceKey() {
|
||||
return KEY_FLASH;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
mScreen = screen;
|
||||
mPreference = screen.findPreference(getPreferenceKey());
|
||||
super.displayPreference(screen);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume() {
|
||||
mSettingObserver.register(mContext.getContentResolver(), true);
|
||||
updatePreference();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
updatePreference();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPause() {
|
||||
mSettingObserver.register(mContext.getContentResolver(), false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
Settings.Secure.putInt(mContext.getContentResolver(),
|
||||
Settings.Secure.ASSIST_DISCLOSURE_ENABLED,
|
||||
(boolean) newValue ? 1 : 0);
|
||||
return true;
|
||||
}
|
||||
|
||||
private void updatePreference() {
|
||||
if (mPreference == null || !(mPreference instanceof TwoStatePreference)) {
|
||||
return;
|
||||
}
|
||||
if (isAvailable()) {
|
||||
if (mScreen.findPreference(getPreferenceKey()) == null) {
|
||||
// add it if it's not on scree
|
||||
mScreen.addPreference(mPreference);
|
||||
}
|
||||
} else {
|
||||
mScreen.removePreference(mPreference);
|
||||
}
|
||||
ComponentName assistant = getCurrentAssist();
|
||||
|
||||
boolean isContextChecked = AssistContextPreferenceController.isChecked(mContext);
|
||||
|
||||
mPreference.setEnabled(isContextChecked && isPreInstalledAssistant(assistant));
|
||||
((TwoStatePreference) mPreference).setChecked(willShowFlash(assistant));
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
boolean willShowFlash(ComponentName assistant) {
|
||||
return AssistUtils.shouldDisclose(mContext, assistant);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
boolean isPreInstalledAssistant(ComponentName assistant) {
|
||||
return AssistUtils.isPreinstalledAssistant(mContext, assistant);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
boolean allowDisablingAssistDisclosure() {
|
||||
return AssistUtils.allowDisablingAssistDisclosure(mContext);
|
||||
}
|
||||
|
||||
private ComponentName getCurrentAssist() {
|
||||
return mAssistUtils.getAssistComponentForUser(UserHandle.myUserId());
|
||||
}
|
||||
|
||||
class SettingObserver extends AssistSettingObserver {
|
||||
|
||||
private final Uri URI =
|
||||
Settings.Secure.getUriFor(Settings.Secure.ASSIST_DISCLOSURE_ENABLED);
|
||||
private final Uri CONTEXT_URI =
|
||||
Settings.Secure.getUriFor(Settings.Secure.ASSIST_STRUCTURE_ENABLED);
|
||||
|
||||
@Override
|
||||
protected List<Uri> getSettingUris() {
|
||||
return Arrays.asList(URI, CONTEXT_URI);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSettingChange() {
|
||||
updatePreference();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
Reference in New Issue
Block a user