Move assist gestures settings to overlay

Bug: 37427306

Test: make -j RunSettingsRoboTests && manual testing of settings
Change-Id: If2b0ec9a966334a91f090051dee661011bfc0d70
This commit is contained in:
Kevin Chyn
2017-06-09 13:37:14 -07:00
parent 86b8f4460d
commit f475bc2fbe
7 changed files with 50 additions and 250 deletions

View File

@@ -23,6 +23,7 @@ import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -48,7 +49,8 @@ public class AssistGestureSettings extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
return R.xml.assist_gesture_settings;
return FeatureFactory.getFactory(getContext())
.getAssistGestureFeatureProvider().getPreferenceResourceId();
}
@Override
@@ -60,7 +62,9 @@ public class AssistGestureSettings extends DashboardFragment {
Lifecycle lifecycle) {
final List<PreferenceController> controllers = new ArrayList<>();
controllers.add(new AssistGesturePreferenceController(context, lifecycle, KEY_ASSIST));
controllers.add(new AssistGestureSensitivityPreferenceController(context, lifecycle));
controllers.addAll(FeatureFactory.getFactory(context).getAssistGestureFeatureProvider()
.getControllers(context, lifecycle));
return controllers;
}