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

Wake notifications to TogglePreferenceController

Browse Source 
Convert Wake for new notifications to TogglePreferenceController
Because Slice controller only support Constructor(context)
Move other parameter to setAmbientDisplayConfiguration

Change-Id: I01042b84217ad9592fece966374140dffaf813e4
Fixes:67997460
Test: make RunSettingsRoboTests -j
This commit is contained in:
HJ ChangLiao
2018-03-28 17:13:03 +08:00
parent 76f24ebbaf
commit 5621641c41
4 changed files with 52 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/display/AmbientDisplaySettings.java
View File

@@ -26,6 +26,7 @@ import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.gestures.DoubleTapScreenPreferenceController;
import com.android.settings.gestures.PickupGesturePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -52,11 +53,9 @@ public class AmbientDisplaySettings extends DashboardFragment {
private AmbientDisplayConfiguration mConfig;
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle, AmbientDisplayConfiguration config,
MetricsFeatureProvider metricsFeatureProvider) {
Lifecycle lifecycle, AmbientDisplayConfiguration config) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new AmbientDisplayNotificationsPreferenceController(context, config,
metricsFeatureProvider));
controllers.add(new DoubleTapScreenPreferenceController(context, lifecycle, config,
MY_USER_ID, KEY_AMBIENT_DISPLAY_DOUBLE_TAP));
controllers.add(new PickupGesturePreferenceController(context, lifecycle, config,
@@ -71,6 +70,9 @@ public class AmbientDisplaySettings extends DashboardFragment {
AmbientDisplayAlwaysOnPreferenceController.class);
controller.setConfig(getConfig(context));
controller.setCallback(this::updatePreferenceStates);
final AmbientDisplayNotificationsPreferenceController notificationController = use(
AmbientDisplayNotificationsPreferenceController.class);
notificationController.setConfig(getConfig(context));
}
@Override
@@ -85,8 +87,7 @@ public class AmbientDisplaySettings extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle(),
getConfig(context), mMetricsFeatureProvider);
return buildPreferenceControllers(context, getLifecycle(), getConfig(context));
}
@Override
@@ -111,7 +112,7 @@ public class AmbientDisplaySettings extends DashboardFragment {
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context, null,
new AmbientDisplayConfiguration(context), null);
new AmbientDisplayConfiguration(context));
}
};