Merge "Forward SeekBarPreference key events to seekBar view" (ec387518) · Commits · e / os / android_frameworks_base

core/java/android/preference/SeekBarPreference.java

+8 −11

Original line number	Diff line number	Diff line
		@@ -96,19 +96,16 @@ public class SeekBarPreference extends Preference

		@Override
		public boolean onKey(View v, int keyCode, KeyEvent event) {
		if (event.getAction() != KeyEvent.ACTION_UP) {
		if (keyCode == KeyEvent.KEYCODE_PLUS
		\|\| keyCode == KeyEvent.KEYCODE_EQUALS) {
		setProgress(getProgress() + 1);
		return true;
		}
		if (keyCode == KeyEvent.KEYCODE_MINUS) {
		setProgress(getProgress() - 1);
		return true;
		}
		if (event.getAction() != KeyEvent.ACTION_DOWN) {
		return false;
		}

		SeekBar seekBar = (SeekBar) v.findViewById(com.android.internal.R.id.seekbar);
		if (seekBar == null) {
		return false;
		}
		return seekBar.onKeyDown(keyCode, event);
		}

		public void setMax(int max) {
		if (max != mMax) {

+3 −0

Original line number	Diff line number	Diff line
		@@ -706,9 +706,12 @@ public abstract class AbsSeekBar extends ProgressBar {
		int increment = mKeyProgressIncrement;
		switch (keyCode) {
		case KeyEvent.KEYCODE_DPAD_LEFT:
		case KeyEvent.KEYCODE_MINUS:
		increment = -increment;
		// fallthrough
		case KeyEvent.KEYCODE_DPAD_RIGHT:
		case KeyEvent.KEYCODE_PLUS:
		case KeyEvent.KEYCODE_EQUALS:
		increment = isLayoutRtl() ? -increment : increment;

		if (setProgressInternal(getProgress() + increment, true, true)) {