Fix home/menu unlock with long press hardware key (9c855901) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java

+74 −49

Original line number	Diff line number	Diff line
		@@ -74,6 +74,8 @@ public class KeyguardViewManager {
		private boolean mScreenOn = false;
		private LockPatternUtils mLockPatternUtils;

		private boolean mUnlockKeyDown = false;

		public interface ShowListener {
		void onShown(IBinder windowToken);
		};
		@@ -144,39 +146,46 @@ public class KeyguardViewManager {

		@Override
		public boolean dispatchKeyEvent(KeyEvent event) {
		if (event.getAction() == KeyEvent.ACTION_DOWN && mKeyguardView != null) {
		if (mKeyguardView != null) {
		int keyCode = event.getKeyCode();
		String action = null;
		switch (keyCode) {
		case KeyEvent.KEYCODE_BACK:
		if (mKeyguardView.handleBackKey()) {
		int action = event.getAction();

		if (action == KeyEvent.ACTION_DOWN) {
		if (handleKeyDown(keyCode, event)) {
		return true;
		}
		} else if (action == KeyEvent.ACTION_UP) {
		if (handleKeyUp(keyCode, event)) {
		return true;
		}
		}
		}
		return super.dispatchKeyEvent(event);
		}
		}

		public boolean handleKeyDown(int keyCode, KeyEvent event) {
		if (event.getRepeatCount() == 0) {
		mUnlockKeyDown = true;
		}
		if (event.isLongPress()) {
		String action = null;
		switch (keyCode) {
		case KeyEvent.KEYCODE_BACK:
		action = Settings.System.LOCKSCREEN_LONG_BACK_ACTION;
		}
		break;
		case KeyEvent.KEYCODE_HOME:
		if (mKeyguardView.handleHomeKey()) {
		return true;
		}
		if (event.isLongPress()) {
		action = Settings.System.LOCKSCREEN_LONG_HOME_ACTION;
		}
		break;
		case KeyEvent.KEYCODE_MENU:
		if (mKeyguardView.handleMenuKey()) {
		return true;
		}
		if (event.isLongPress()) {
		action = Settings.System.LOCKSCREEN_LONG_MENU_ACTION;
		}
		break;
		}

		if (action != null) {
		mUnlockKeyDown = false;
		String uri = Settings.System.getString(mContext.getContentResolver(), action);
		if (uri != null && runAction(mContext, uri) != ACTION_RESULT_NOTRUN) {
		if (uri != null && runAction(mContext, uri)) {
		long[] pattern = getLongPressVibePattern(mContext);
		if (pattern != null) {
		Vibrator v = (Vibrator) mContext.getSystemService(mContext.VIBRATOR_SERVICE);
		@@ -190,32 +199,48 @@ public class KeyguardViewManager {
		}
		}
		}
		return super.dispatchKeyEvent(event);
		}
		return false;
		}

		private static final int ACTION_RESULT_RUN = 0;
		private static final int ACTION_RESULT_NOTRUN = 1;
		public boolean handleKeyUp(int keyCode, KeyEvent event) {
		if (mUnlockKeyDown) {
		switch (keyCode) {
		case KeyEvent.KEYCODE_BACK:
		if (mKeyguardView.handleBackKey()) {
		return true;
		}
		case KeyEvent.KEYCODE_HOME:
		if (mKeyguardView.handleHomeKey()) {
		return true;
		}
		case KeyEvent.KEYCODE_MENU:
		if (mKeyguardView.handleMenuKey()) {
		return true;
		}
		}
		}
		return false;
		}

		private static int runAction(Context context, String uri) {
		private static boolean runAction(Context context, String uri) {
		if ("FLASHLIGHT".equals(uri)) {
		context.sendBroadcast(new Intent("net.cactii.flash2.TOGGLE_FLASHLIGHT"));
		return ACTION_RESULT_RUN;
		return true;
		} else if ("NEXT".equals(uri)) {
		sendMediaButtonEvent(context, KeyEvent.KEYCODE_MEDIA_NEXT);
		return ACTION_RESULT_RUN;
		return true;
		} else if ("PREVIOUS".equals(uri)) {
		sendMediaButtonEvent(context, KeyEvent.KEYCODE_MEDIA_PREVIOUS);
		return ACTION_RESULT_RUN;
		return true;
		} else if ("PLAYPAUSE".equals(uri)) {
		sendMediaButtonEvent(context, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE);
		return ACTION_RESULT_RUN;
		return true;
		} else if ("SOUND".equals(uri)) {
		toggleSilentMode(context);
		return ACTION_RESULT_RUN;
		return true;
		}

		return ACTION_RESULT_NOTRUN;
		return false;
		}

		private static void sendMediaButtonEvent(Context context, int code) {