Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "GesturesSettingPreferenceController to Toggle" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-09 18:59:44 +00:00
committed by Android (Google) Code Review
parent b90e5aff53 3c4c3fc5c7
commit 283ac08e86
40 changed files with 320 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/applications/assist/ManageAssist.java
View File

@@ -60,6 +60,12 @@ public class ManageAssist extends DashboardFragment {
return MetricsEvent.APPLICATIONS_MANAGE_ASSIST;
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
use(AssistGestureSettingsPreferenceController.class).setAssistOnly(true);
}
@Override
public void onResume() {
super.onResume();
@@ -73,8 +79,6 @@ public class ManageAssist extends DashboardFragment {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new DefaultAssistPreferenceController(context, "default_assist",
true /* showSetting */));
controllers.add(new AssistGestureSettingsPreferenceController(context, lifecycle,
KEY_ASSIST, true /* assistOnly */));
controllers.add(new AssistContextPreferenceController(context, lifecycle));
controllers.add(new AssistScreenshotPreferenceController(context, lifecycle));
controllers.add(new AssistFlashScreenPreferenceController(context, lifecycle));