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

Merge "Add more gesture setting pages."

Browse Source
This commit is contained in:
TreeHugger Robot
2016-11-09 21:13:01 +00:00
committed by Android (Google) Code Review
parent 994efdf467 b99ea90046
commit 2c61018618
23 changed files with 1375 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/inputmethod/InputAndGestureSettings.java
View File

@@ -17,10 +17,17 @@
package com.android.settings.inputmethod;
import android.content.Context;
import android.os.UserHandle;
import android.support.annotation.VisibleForTesting;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.gestures.DoubleTapPowerPreferenceController;
import com.android.settings.gestures.DoubleTapScreenPreferenceController;
import com.android.settings.gestures.DoubleTwistPreferenceController;
import com.android.settings.gestures.PickupGesturePreferenceController;
import com.android.settings.gestures.SwipeToNotificationPreferenceController;
import com.android.settingslib.drawer.CategoryKey;
@@ -31,6 +38,8 @@ public class InputAndGestureSettings extends DashboardFragment {
private static final String TAG = "InputAndGestureSettings";
private AmbientDisplayConfiguration mAmbientDisplayConfig;
@Override
public int getMetricsCategory() {
return INPUT_AND_GESTURE_CATEGORY_FRAGMENT;
@@ -57,10 +66,24 @@ public class InputAndGestureSettings extends DashboardFragment {
= new GameControllerPreferenceController(context);
getLifecycle().addObserver(gameControllerPreferenceController);
if (mAmbientDisplayConfig == null) {
mAmbientDisplayConfig = new AmbientDisplayConfiguration(context);
}
final List<PreferenceController> controllers = new ArrayList<>();
controllers.add(gameControllerPreferenceController);
// Gestures
controllers.add(new SwipeToNotificationPreferenceController(context));
controllers.add(new DoubleTwistPreferenceController(context));
controllers.add(new DoubleTapPowerPreferenceController(context));
controllers.add(new PickupGesturePreferenceController(
context, mAmbientDisplayConfig, UserHandle.myUserId()));
controllers.add(new DoubleTapScreenPreferenceController(
context, mAmbientDisplayConfig, UserHandle.myUserId()));
return controllers;
}
@VisibleForTesting
void setAmbientDisplayConfig(AmbientDisplayConfiguration ambientConfig) {
mAmbientDisplayConfig = ambientConfig;
}
}