- Share the same set of pref controller between main UI and search in AccountDashboardFragment. - Update WorkSoundPreferenceController to actually do something for updateNonIndexable() method. - LockscreenDashboardFragment to also suppress "Work notification" header. I think we just missed it previously. Change-Id: Ifa6f9b2077c9810ffff33f240929f418d4a8a5aa Fixes: 62167659 Test: robotests
167 lines
6.8 KiB
Java
167 lines
6.8 KiB
Java
/*
|
|
* 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.security;
|
|
|
|
import android.content.Context;
|
|
import android.provider.SearchIndexableResource;
|
|
|
|
import com.android.internal.hardware.AmbientDisplayConfiguration;
|
|
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
|
import com.android.settings.R;
|
|
import com.android.settings.dashboard.DashboardFragment;
|
|
import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController;
|
|
import com.android.settings.display.AmbientDisplayNotificationsPreferenceController;
|
|
import com.android.settings.gestures.DoubleTapScreenPreferenceController;
|
|
import com.android.settings.gestures.PickupGesturePreferenceController;
|
|
import com.android.settings.notification.LockScreenNotificationPreferenceController;
|
|
import com.android.settings.search.BaseSearchIndexProvider;
|
|
import com.android.settings.users.AddUserWhenLockedPreferenceController;
|
|
import com.android.settingslib.core.AbstractPreferenceController;
|
|
import com.android.settingslib.core.lifecycle.Lifecycle;
|
|
import com.android.settingslib.search.SearchIndexable;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.Arrays;
|
|
import java.util.List;
|
|
|
|
import androidx.annotation.VisibleForTesting;
|
|
|
|
/**
|
|
* Settings screen for lock screen preference
|
|
*/
|
|
@SearchIndexable
|
|
public class LockscreenDashboardFragment extends DashboardFragment
|
|
implements OwnerInfoPreferenceController.OwnerInfoCallback {
|
|
|
|
public static final String KEY_AMBIENT_DISPLAY_ALWAYS_ON = "ambient_display_always_on";
|
|
|
|
private static final String TAG = "LockscreenDashboardFragment";
|
|
|
|
@VisibleForTesting
|
|
static final String KEY_LOCK_SCREEN_NOTIFICATON = "security_setting_lock_screen_notif";
|
|
@VisibleForTesting
|
|
static final String KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE_HEADER =
|
|
"security_setting_lock_screen_notif_work_header";
|
|
@VisibleForTesting
|
|
static final String KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE =
|
|
"security_setting_lock_screen_notif_work";
|
|
@VisibleForTesting
|
|
static final String KEY_ADD_USER_FROM_LOCK_SCREEN =
|
|
"security_lockscreen_add_users_when_locked";
|
|
|
|
|
|
private AmbientDisplayConfiguration mConfig;
|
|
private OwnerInfoPreferenceController mOwnerInfoPreferenceController;
|
|
|
|
@Override
|
|
public int getMetricsCategory() {
|
|
return MetricsEvent.SETTINGS_LOCK_SCREEN_PREFERENCES;
|
|
}
|
|
|
|
@Override
|
|
protected String getLogTag() {
|
|
return TAG;
|
|
}
|
|
|
|
@Override
|
|
protected int getPreferenceScreenResId() {
|
|
return R.xml.security_lockscreen_settings;
|
|
}
|
|
|
|
@Override
|
|
public int getHelpResource() {
|
|
return R.string.help_url_lockscreen;
|
|
}
|
|
|
|
@Override
|
|
public void onAttach(Context context) {
|
|
super.onAttach(context);
|
|
use(AmbientDisplayAlwaysOnPreferenceController.class)
|
|
.setConfig(getConfig(context))
|
|
.setCallback(this::updatePreferenceStates);
|
|
use(AmbientDisplayNotificationsPreferenceController.class).setConfig(getConfig(context));
|
|
use(DoubleTapScreenPreferenceController.class).setConfig(getConfig(context));
|
|
use(PickupGesturePreferenceController.class).setConfig(getConfig(context));
|
|
}
|
|
|
|
@Override
|
|
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
|
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
|
final Lifecycle lifecycle = getLifecycle();
|
|
final LockScreenNotificationPreferenceController notificationController =
|
|
new LockScreenNotificationPreferenceController(context,
|
|
KEY_LOCK_SCREEN_NOTIFICATON,
|
|
KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE_HEADER,
|
|
KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE);
|
|
lifecycle.addObserver(notificationController);
|
|
controllers.add(notificationController);
|
|
controllers.add(new AddUserWhenLockedPreferenceController(
|
|
context, KEY_ADD_USER_FROM_LOCK_SCREEN, lifecycle));
|
|
mOwnerInfoPreferenceController =
|
|
new OwnerInfoPreferenceController(context, this, lifecycle);
|
|
controllers.add(mOwnerInfoPreferenceController);
|
|
|
|
return controllers;
|
|
}
|
|
|
|
@Override
|
|
public void onOwnerInfoUpdated() {
|
|
if (mOwnerInfoPreferenceController != null) {
|
|
mOwnerInfoPreferenceController.updateSummary();
|
|
}
|
|
}
|
|
|
|
private AmbientDisplayConfiguration getConfig(Context context) {
|
|
if (mConfig == null) {
|
|
mConfig = new AmbientDisplayConfiguration(context);
|
|
}
|
|
return mConfig;
|
|
}
|
|
|
|
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
|
new BaseSearchIndexProvider() {
|
|
@Override
|
|
public List<SearchIndexableResource> getXmlResourcesToIndex(
|
|
Context context, boolean enabled) {
|
|
final SearchIndexableResource sir = new SearchIndexableResource(context);
|
|
sir.xmlResId = R.xml.security_lockscreen_settings;
|
|
return Arrays.asList(sir);
|
|
}
|
|
|
|
@Override
|
|
public List<AbstractPreferenceController> createPreferenceControllers(
|
|
Context context) {
|
|
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
|
controllers.add(new LockScreenNotificationPreferenceController(context));
|
|
controllers.add(new AddUserWhenLockedPreferenceController(context,
|
|
KEY_ADD_USER_FROM_LOCK_SCREEN, null /* lifecycle */));
|
|
controllers.add(new OwnerInfoPreferenceController(
|
|
context, null /* fragment */, null /* lifecycle */));
|
|
return controllers;
|
|
}
|
|
|
|
@Override
|
|
public List<String> getNonIndexableKeys(Context context) {
|
|
final List<String> niks = super.getNonIndexableKeys(context);
|
|
niks.add(KEY_ADD_USER_FROM_LOCK_SCREEN);
|
|
niks.add(KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE);
|
|
niks.add(KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE_HEADER);
|
|
return niks;
|
|
}
|
|
};
|
|
}
|