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

Commit eb29f89c authored by Konsta's avatar Konsta Committed by Bruno Martins
Browse files

Framework: Volume key cursor control 

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

Change-Id: I8e20240e7bee5351ab20bb3d701eb95a5fd3e112
parent 443f3d96

core/java/android/inputmethodservice/InputMethodService.java

+33 −0
Original line number Diff line number Diff line
@@ -469,6 +469,11 @@ public class InputMethodService extends AbstractInputMethodService { 
     */

    private IBinder mCurHideInputToken;



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

        onComputeInsets(mTmpInsets);

        if (!mViewsCreated) {
@@ -1090,6 +1095,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;

        }
@@ -1130,6 +1138,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
@@ -1191,6 +1202,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);



        mIsAutomotive = isAutomotive();

        mAutomotiveHideNavBarForKeyboard = getApplicationContext().getResources().getBoolean(
@@ -2588,6 +2601,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);

    }
@@ -2638,6 +2667,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
@@ -4462,6 +4462,15 @@ public final class Settings { 
        @Deprecated

        public static final String ANIMATOR_DURATION_SCALE = Global.ANIMATOR_DURATION_SCALE;









        /**









          * 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";

















        /**









         * Control the type of rotation which can be performed using the accelerometer









         * if ACCELEROMETER_ROTATION is enabled.