fw/b: Implement hardware keys custom rebinding (3ecd6e45) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/PhoneFallbackEventHandler.java

+0 −12

Original line number	Original line	Diff line number	Diff line
	@@ -143,18 +143,6 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler {
	dispatcher.startTracking(event, this);		dispatcher.startTracking(event, this);
	} else if (event.isLongPress() && dispatcher.isTracking(event)) {		} else if (event.isLongPress() && dispatcher.isTracking(event)) {
	dispatcher.performedLongPress(event);		dispatcher.performedLongPress(event);
	if (isUserSetupComplete()) {
	mView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
	// Broadcast an intent that the Camera button was longpressed
	Intent intent = new Intent(Intent.ACTION_CAMERA_BUTTON, null);
	intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
	intent.putExtra(Intent.EXTRA_KEY_EVENT, event);
	mContext.sendOrderedBroadcastAsUser(intent, UserHandle.CURRENT_OR_SELF,
	null, null, null, 0, null, null);
	} else {
	Log.i(TAG, "Not dispatching CAMERA long press because user "
	+ "setup is in progress.");
	}
	}		}
	return true;		return true;
	}		}

packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBar.java

+3 −22

Original line number	Original line	Diff line number	Diff line
	@@ -1488,28 +1488,9 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
	if (!mView.isRecentsButtonVisible() && mScreenPinningActive) {		if (!mView.isRecentsButtonVisible() && mScreenPinningActive) {
	return onLongPressBackHome(v);		return onLongPressBackHome(v);
	}		}
	if (shouldDisableNavbarGestures()) {		KeyButtonView keyButtonView = (KeyButtonView) v;
	return false;		keyButtonView.sendEvent(KeyEvent.ACTION_DOWN, KeyEvent.FLAG_LONG_PRESS);
	}		keyButtonView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED);
	mMetricsLogger.action(MetricsEvent.ACTION_ASSIST_LONG_PRESS);
	mUiEventLogger.log(NavBarActionEvent.NAVBAR_ASSIST_LONGPRESS);
	Bundle args = new Bundle();
	args.putInt(
	AssistManager.INVOCATION_TYPE_KEY,
	AssistManager.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS);
	// If Launcher has requested to override long press home, add a delay for the ripple.
	// TODO(b/304146255): Remove this delay once we can exclude 3-button nav from screenshot.
	boolean delayAssistInvocation = mAssistManagerLazy.get().shouldOverrideAssist(
	AssistManager.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS);
	// In practice, I think v should always be a KeyButtonView, but just being safe.
	if (delayAssistInvocation && v instanceof KeyButtonView) {
	((KeyButtonView) v).setOnRippleInvisibleRunnable(
	() -> mAssistManagerLazy.get().startAssist(args));
	} else {
	mAssistManagerLazy.get().startAssist(args);
	}
	mCentralSurfacesOptionalLazy.get().ifPresent(CentralSurfaces::awakenDreams);
	mView.abortCurrentGesture();
	return true;		return true;
	}		}

services/core/java/com/android/server/input/KeyGestureController.java

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -875,8 +875,9 @@ final class KeyGestureController {
	}		}
	break;		break;
	case KeyEvent.KEYCODE_ASSIST:		case KeyEvent.KEYCODE_ASSIST:
	Slog.wtf(TAG, "KEYCODE_ASSIST should be handled in interceptKeyBeforeQueueing");		case KeyEvent.KEYCODE_MENU:
	return true;		// Let policy handle it in PhoneWindowManager.interceptKeyBeforeQueueing
			return false;
	case KeyEvent.KEYCODE_VOICE_ASSIST:		case KeyEvent.KEYCODE_VOICE_ASSIST:
	Slog.wtf(TAG, "KEYCODE_VOICE_ASSIST should be handled in"		Slog.wtf(TAG, "KEYCODE_VOICE_ASSIST should be handled in"
	+ " interceptKeyBeforeQueueing");		+ " interceptKeyBeforeQueueing");

services/core/java/com/android/server/policy/PhoneWindowManager.java

+468 −153

File changed.

Preview size limit exceeded, changes collapsed.