Add gestures as inline actions for Phone Buddy am: 469e4ea228 (d88a7681) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/gestures/AssistGesturePreferenceController.java

+18 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.settings.gestures;

		import android.content.Context;
		import android.content.Intent;
		import android.provider.Settings;
		import android.support.v7.preference.Preference;
		import android.support.v7.preference.PreferenceScreen;
		@@ -25,12 +26,18 @@ import android.support.v7.preference.TwoStatePreference;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.settings.R;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.search.DatabaseIndexingUtils;
		import com.android.settings.search.InlineSwitchPayload;
		import com.android.settings.search.ResultPayload;
		import com.android.settingslib.core.lifecycle.Lifecycle;
		import com.android.settingslib.core.lifecycle.events.OnResume;

		public class AssistGesturePreferenceController extends GesturePreferenceController
		implements OnResume {

		private final int ON = 1;
		private final int OFF = 0;

		private static final String PREF_KEY_VIDEO = "gesture_assist_video";
		private final String mAssistGesturePrefKey;

		@@ -136,7 +143,7 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		final boolean enabled = (boolean) newValue;
		Settings.Secure.putInt(mContext.getContentResolver(),
		Settings.Secure.ASSIST_GESTURE_ENABLED, enabled ? 1 : 0);
		Settings.Secure.ASSIST_GESTURE_ENABLED, enabled ? ON : OFF);
		updateState(preference);
		return true;
		}
		@@ -157,4 +164,14 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
		Settings.Secure.ASSIST_GESTURE_ENABLED, 1);
		return assistGestureEnabled != 0;
		}

		@Override
		public ResultPayload getResultPayload() {
		final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
		AssistGestureSettings.class.getName(), mAssistGesturePrefKey,
		mContext.getString(R.string.display_settings));

		return new InlineSwitchPayload(Settings.Secure.ASSIST_GESTURE_ENABLED,
		ResultPayload.SettingsSource.SECURE, ON, intent, isAvailable());
		}
		}

src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java

+20 −1

Original line number	Diff line number	Diff line
		@@ -17,15 +17,24 @@
		package com.android.settings.gestures;

		import android.content.Context;
		import android.content.Intent;
		import android.content.SharedPreferences;
		import android.provider.Settings;
		import android.support.v7.preference.Preference;

		import com.android.settings.DisplaySettings;
		import com.android.settings.R;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.search.DatabaseIndexingUtils;
		import com.android.settings.search.InlineSwitchPayload;
		import com.android.settings.search.ResultPayload;
		import com.android.settingslib.core.lifecycle.Lifecycle;

		public class DoubleTapPowerPreferenceController extends GesturePreferenceController {

		private final int ON = 0;
		private final int OFF = 1;

		private static final String PREF_KEY_VIDEO = "gesture_double_tap_power_video";
		private final String mDoubleTapPowerKey;

		@@ -63,7 +72,7 @@ public class DoubleTapPowerPreferenceController extends GesturePreferenceControl
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		boolean enabled = (boolean) newValue;
		Settings.Secure.putInt(mContext.getContentResolver(),
		Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, enabled ? 0 : 1);
		Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, enabled ? ON : OFF);
		return true;
		}

		@@ -73,4 +82,14 @@ public class DoubleTapPowerPreferenceController extends GesturePreferenceControl
		Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
		return cameraDisabled == 0;
		}

		@Override
		public ResultPayload getResultPayload() {
		final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
		DoubleTapPowerSettings.class.getName(), mDoubleTapPowerKey,
		mContext.getString(R.string.display_settings));

		return new InlineSwitchPayload(Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
		ResultPayload.SettingsSource.SECURE, ON, intent, isAvailable());
		}
		}

src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java

+19 −1

Original line number	Diff line number	Diff line
		@@ -18,16 +18,24 @@ package com.android.settings.gestures;

		import android.annotation.UserIdInt;
		import android.content.Context;
		import android.content.Intent;
		import android.content.SharedPreferences;
		import android.provider.Settings;
		import android.support.v7.preference.Preference;

		import com.android.internal.hardware.AmbientDisplayConfiguration;
		import com.android.settings.R;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.search.DatabaseIndexingUtils;
		import com.android.settings.search.InlineSwitchPayload;
		import com.android.settings.search.ResultPayload;
		import com.android.settingslib.core.lifecycle.Lifecycle;

		public class DoubleTapScreenPreferenceController extends GesturePreferenceController {

		private final int ON = 1;
		private final int OFF = 0;

		private static final String PREF_KEY_VIDEO = "gesture_double_tap_screen_video";
		private final String mDoubleTapScreenPrefKey;

		@@ -63,7 +71,7 @@ public class DoubleTapScreenPreferenceController extends GesturePreferenceContro
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		final boolean enabled = (boolean) newValue;
		Settings.Secure.putInt(mContext.getContentResolver(),
		Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, enabled ? 1 : 0);
		Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, enabled ? ON : OFF);
		return true;
		}

		@@ -76,4 +84,14 @@ public class DoubleTapScreenPreferenceController extends GesturePreferenceContro
		protected boolean isSwitchPrefEnabled() {
		return mAmbientConfig.pulseOnDoubleTapEnabled(mUserId);
		}

		@Override
		public ResultPayload getResultPayload() {
		final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
		DoubleTapScreenSettings.class.getName(), mDoubleTapScreenPrefKey,
		mContext.getString(R.string.display_settings));

		return new InlineSwitchPayload(Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP,
		ResultPayload.SettingsSource.SECURE, ON, intent, isAvailable());
		}
		}

src/com/android/settings/gestures/DoubleTwistPreferenceController.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -30,11 +30,13 @@ import android.text.TextUtils;

		import com.android.settings.R;
		import com.android.settings.Utils;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settingslib.core.lifecycle.Lifecycle;

		public class DoubleTwistPreferenceController extends GesturePreferenceController {

		private final int ON = 1;
		private final int OFF = 0;

		private static final String PREF_KEY_VIDEO = "gesture_double_twist_video";
		private final String mDoubleTwistPrefKey;
		private final UserManager mUserManager;
		@@ -83,7 +85,7 @@ public class DoubleTwistPreferenceController extends GesturePreferenceController

		@Override
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		final int enabled = (boolean) newValue ? 1 : 0;
		final int enabled = (boolean) newValue ? ON : OFF;
		Settings.Secure.putInt(mContext.getContentResolver(),
		Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, enabled);
		final int managedProfileUserId = getManagedProfileUserId();

src/com/android/settings/gestures/PickupGesturePreferenceController.java

+21 −4

Original line number	Diff line number	Diff line
		@@ -18,17 +18,24 @@ package com.android.settings.gestures;

		import android.annotation.UserIdInt;
		import android.content.Context;
		import android.content.Intent;
		import android.content.SharedPreferences;
		import android.provider.Settings;
		import android.support.v7.preference.Preference;

		import com.android.internal.hardware.AmbientDisplayConfiguration;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.R;
		import com.android.settings.search.DatabaseIndexingUtils;
		import com.android.settings.search.InlineSwitchPayload;
		import com.android.settings.search.ResultPayload;
		import com.android.settingslib.core.lifecycle.Lifecycle;

		public class PickupGesturePreferenceController extends GesturePreferenceController {

		private static final String PREF_VIDEO_KEY = "gesture_pick_up_video";
		private final int ON = 1;
		private final int OFF = 0;

		private static final String PREF_KEY_VIDEO = "gesture_pick_up_video";
		private final String mPickUpPrefKey;

		private final AmbientDisplayConfiguration mAmbientConfig;
		@@ -56,7 +63,7 @@ public class PickupGesturePreferenceController extends GesturePreferenceControll

		@Override
		protected String getVideoPrefKey() {
		return PREF_VIDEO_KEY;
		return PREF_KEY_VIDEO;
		}

		@Override
		@@ -73,7 +80,7 @@ public class PickupGesturePreferenceController extends GesturePreferenceControll
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		final boolean enabled = (boolean) newValue;
		Settings.Secure.putInt(mContext.getContentResolver(),
		Settings.Secure.DOZE_PULSE_ON_PICK_UP, enabled ? 1 : 0);
		Settings.Secure.DOZE_PULSE_ON_PICK_UP, enabled ? ON : OFF);
		return true;
		}

		@@ -81,4 +88,14 @@ public class PickupGesturePreferenceController extends GesturePreferenceControll
		public boolean canHandleClicks() {
		return mAmbientConfig.pulseOnPickupCanBeModified(mUserId);
		}

		@Override
		public ResultPayload getResultPayload() {
		final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
		PickupGestureSettings.class.getName(), mPickUpPrefKey,
		mContext.getString(R.string.display_settings));

		return new InlineSwitchPayload(Settings.Secure.DOZE_PULSE_ON_PICK_UP,
		ResultPayload.SettingsSource.SECURE, ON, intent, isAvailable());
		}
		}