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

Unverified Commit 518ee08c authored by Konsta's avatar Konsta Committed by Michael Bestas
Browse files

Framework: Volume key cursor control (1/2) 

This feature is moved to framework so it also works with third
party keyboards.

Change-Id: I8e20240e7bee5351ab20bb3d701eb95a5fd3e112
parent 5c4dfdb8

core/java/android/inputmethodservice/InputMethodService.java

+34 −0
Original line number Diff line number Diff line
@@ -326,6 +326,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 =

            new ViewTreeObserver.OnComputeInternalInsetsListener() {

        public void onComputeInternalInsets(ViewTreeObserver.InternalInsetsInfo info) {
@@ -1999,6 +2004,26 @@ public class InputMethodService extends AbstractInputMethodService { 
            }

            return false;

        }

        if (event.getKeyCode() == KeyEvent.KEYCODE_VOLUME_UP) {

            mVolumeKeyCursorControl = Settings.System.getInt(getContentResolver(),

                    Settings.System.VOLUME_KEY_CURSOR_CONTROL, 0);

            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) {

            mVolumeKeyCursorControl = Settings.System.getInt(getContentResolver(),

                    Settings.System.VOLUME_KEY_CURSOR_CONTROL, 0);

            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);

    }
@@ -2049,6 +2074,15 @@ public class InputMethodService extends AbstractInputMethodService { 
                return handleBack(true);

            }

        }

        if (event.getKeyCode() == KeyEvent.KEYCODE_VOLUME_UP

                 || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {

            mVolumeKeyCursorControl = Settings.System.getInt(getContentResolver(),

                    Settings.System.VOLUME_KEY_CURSOR_CONTROL, 0);

            if (isInputViewShown() && (mVolumeKeyCursorControl != VOLUME_CURSOR_OFF)) {

                return true;

            }

            return false;

        }

        return doMovementKey(keyCode, event, MOVEMENT_UP);

    }

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -3730,6 +3730,15 @@ public final class Settings { 
         */

        public static final String DOUBLE_TAP_SLEEP_GESTURE = "double_tap_sleep_gesture";



        /**

          * 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.