Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e0fcdff authored May 09, 2016 by Danesh M Committed by Danesh M May 12, 2016

Ensure camera is launched if doing screen off gesture

Currently it launches whatever the right affordance is set to, which is
incorrect. Ensure screen off gesture always launches camera.

Change-Id: I251d37ccc85d014ff46714b222b9074b2092f6e1

parent d9ff407b

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -88,6 +88,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
	public static final String CAMERA_LAUNCH_SOURCE_AFFORDANCE = "lockscreen_affordance";		public static final String CAMERA_LAUNCH_SOURCE_AFFORDANCE = "lockscreen_affordance";
	public static final String CAMERA_LAUNCH_SOURCE_WIGGLE = "wiggle_gesture";		public static final String CAMERA_LAUNCH_SOURCE_WIGGLE = "wiggle_gesture";
	public static final String CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP = "power_double_tap";		public static final String CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP = "power_double_tap";
			public static final String CAMERA_LAUNCH_SOURCE_SCREEN_GESTURE = "screen_gesture";

	public static final String EXTRA_CAMERA_LAUNCH_SOURCE		public static final String EXTRA_CAMERA_LAUNCH_SOURCE
	= "com.android.systemui.camera_launch_source";		= "com.android.systemui.camera_launch_source";
	@@ -568,8 +569,9 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL

	public void launchCamera(String source) {		public void launchCamera(String source) {
	final Intent intent;		final Intent intent;
	if (source.equals(CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP) \|\| !mShortcutHelper		if (source.equals(CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP) \|\|
	.isTargetCustom(LockscreenShortcutsHelper.Shortcuts.RIGHT_SHORTCUT)) {		source.equals(CAMERA_LAUNCH_SOURCE_SCREEN_GESTURE) \|\|
			!mShortcutHelper.isTargetCustom(LockscreenShortcutsHelper.Shortcuts.RIGHT_SHORTCUT)) {
	intent = getCameraIntent();		intent = getCameraIntent();
	} else {		} else {
	intent = mShortcutHelper.getIntent(LockscreenShortcutsHelper.Shortcuts.RIGHT_SHORTCUT);		intent = mShortcutHelper.getIntent(LockscreenShortcutsHelper.Shortcuts.RIGHT_SHORTCUT);

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2783,6 +2783,8 @@ public class NotificationPanelView extends PanelView implements
	mLastCameraLaunchSource = KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP;		mLastCameraLaunchSource = KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP;
	} else if (source == StatusBarManager.CAMERA_LAUNCH_SOURCE_WIGGLE) {		} else if (source == StatusBarManager.CAMERA_LAUNCH_SOURCE_WIGGLE) {
	mLastCameraLaunchSource = KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_WIGGLE;		mLastCameraLaunchSource = KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_WIGGLE;
			} else if (source == StatusBarManager.CAMERA_LAUNCH_SOURCE_SCREEN_GESTURE) {
			mLastCameraLaunchSource = KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_SCREEN_GESTURE;
	} else {		} else {

	// Default.		// Default.