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

Commit 5c39807a authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 73d28900: resolved conflicts for merge of 850cdbe5 to lmp-mr1-dev-plus-aosp

* commit '73d28900':
  Consider RTL layout in DPAD navigation in AbsSeekBar
parents 7ef0d514 73d28900
Loading
Loading
Loading
Loading
+11 −10
Original line number Diff line number Diff line
@@ -695,20 +695,21 @@ public abstract class AbsSeekBar extends ProgressBar {
    @Override
    public boolean onKeyDown(int keyCode, KeyEvent event) {
        if (isEnabled()) {
            int progress = getProgress();
            int increment = mKeyProgressIncrement;
            switch (keyCode) {
                case KeyEvent.KEYCODE_DPAD_LEFT:
                    if (progress <= 0) break;
                    setProgress(progress - mKeyProgressIncrement, true);
                    onKeyChange();
                    return true;

                    increment = -increment;
                    // fallthrough
                case KeyEvent.KEYCODE_DPAD_RIGHT:
                    if (progress >= getMax()) break;
                    setProgress(progress + mKeyProgressIncrement, true);
                    increment = isLayoutRtl() ? -increment : increment;
                    int progress = getProgress() + increment;
                    if (progress > 0 && progress < getMax()) {
                        setProgress(progress, true);
                        onKeyChange();
                        return true;
                    }
                    break;
            }
        }

        return super.onKeyDown(keyCode, event);