resolved conflicts for merge of 850cdbe5 to lmp-mr1-dev-plus-aosp

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