Framework: Volume key cursor control (7bd4f459) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/InputMethodService.java

+33 −0

Original line number	Diff line number	Diff line
		@@ -431,6 +431,11 @@ public class InputMethodService extends AbstractInputMethodService {
		final Insets mTmpInsets = new Insets();
		final int[] mTmpLocation = new int[2];

		int mVolumeKeyCursorControl;
		private static final int VOLUME_CURSOR_OFF = 0;
		private static final int VOLUME_CURSOR_ON = 1;
		private static final int VOLUME_CURSOR_ON_REVERSE = 2;

		final ViewTreeObserver.OnComputeInternalInsetsListener mInsetsComputer = info -> {
		if (isExtractViewShown()) {
		// In true fullscreen mode, we just say the window isn't covering
		@@ -896,6 +901,9 @@ public class InputMethodService extends AbstractInputMethodService {
		service.getContentResolver().registerContentObserver(
		Settings.Secure.getUriFor(Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD),
		false, observer);
		service.getContentResolver().registerContentObserver(
		Settings.System.getUriFor(Settings.System.VOLUME_KEY_CURSOR_CONTROL),
		false, observer);
		return observer;
		}

		@@ -936,6 +944,9 @@ public class InputMethodService extends AbstractInputMethodService {
		// state as if configuration was changed.
		mService.resetStateForNewConfiguration();
		}

		mService.mVolumeKeyCursorControl = Settings.System.getInt(mService.getContentResolver(),
		Settings.System.VOLUME_KEY_CURSOR_CONTROL, 0);
		}

		@Override
		@@ -997,6 +1008,8 @@ public class InputMethodService extends AbstractInputMethodService {
		super.onCreate();
		mImm = (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE);
		mSettingsObserver = SettingsObserver.createAndRegister(this);
		mVolumeKeyCursorControl = Settings.System.getInt(getContentResolver(),
		Settings.System.VOLUME_KEY_CURSOR_CONTROL, 0);
		// TODO(b/111364446) Need to address context lifecycle issue if need to re-create
		// for update resources & configuration correctly when show soft input
		// in non-default display.
		@@ -2347,6 +2360,22 @@ public class InputMethodService extends AbstractInputMethodService {
		}
		return false;
		}
		if (event.getKeyCode() == KeyEvent.KEYCODE_VOLUME_UP) {
		if (isInputViewShown() && mVolumeKeyCursorControl != VOLUME_CURSOR_OFF) {
		sendDownUpKeyEvents(mVolumeKeyCursorControl == VOLUME_CURSOR_ON_REVERSE
		? KeyEvent.KEYCODE_DPAD_RIGHT : KeyEvent.KEYCODE_DPAD_LEFT);
		return true;
		}
		return false;
		}
		if (event.getKeyCode() == KeyEvent.KEYCODE_VOLUME_DOWN) {
		if (isInputViewShown() && mVolumeKeyCursorControl != VOLUME_CURSOR_OFF) {
		sendDownUpKeyEvents(mVolumeKeyCursorControl == VOLUME_CURSOR_ON_REVERSE
		? KeyEvent.KEYCODE_DPAD_LEFT : KeyEvent.KEYCODE_DPAD_RIGHT);
		return true;
		}
		return false;
		}
		return doMovementKey(keyCode, event, MOVEMENT_DOWN);
		}

		@@ -2397,6 +2426,10 @@ public class InputMethodService extends AbstractInputMethodService {
		return handleBack(true);
		}
		}
		if (event.getKeyCode() == KeyEvent.KEYCODE_VOLUME_UP
		\|\| keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
		return isInputViewShown() && mVolumeKeyCursorControl != VOLUME_CURSOR_OFF;
		}
		return doMovementKey(keyCode, event, MOVEMENT_UP);
		}

core/java/android/provider/Settings.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -4476,6 +4476,15 @@ public final class Settings {
		* the setting value. See an example above.
		*/

		/**
		* Volume keys control cursor in text fields (default is 0)
		* 0 - Disabled
		* 1 - Volume up/down moves cursor left/right
		* 2 - Volume up/down moves cursor right/left
		* @hide
		*/
		public static final String VOLUME_KEY_CURSOR_CONTROL = "volume_key_cursor_control";

		/**
		* Settings to backup. This is here so that it's in the same place as the settings
		* keys and easy to update.