Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 71c5d62d: Merge "Consider RTL layout in DPAD navigation in AbsSeekBar"

Browse Source 
* commit '71c5d62d9680207c4d3d25ac3f590f3667b250eb':
  Consider RTL layout in DPAD navigation in AbsSeekBar
This commit is contained in:
Alan Viverette
2014-12-02 19:36:03 +00:00
committed by Android Git Automerger
parent 877d89399a 71c5d62d96
commit 850cdbe58c
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/widget/AbsSeekBar.java
View File

@@ -704,19 +704,20 @@ public abstract class AbsSeekBar extends ProgressBar {
@Override @Override
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {
if (isEnabled()) { if (isEnabled()) {
int progress = getProgress(); int increment = mKeyProgressIncrement;
switch (keyCode) { switch (keyCode) {
case KeyEvent.KEYCODE_DPAD_LEFT: case KeyEvent.KEYCODE_DPAD_LEFT:
if (progress <= 0) break; increment = -increment;
animateSetProgress(progress - mKeyProgressIncrement); // fallthrough
onKeyChange();
return true;
case KeyEvent.KEYCODE_DPAD_RIGHT: case KeyEvent.KEYCODE_DPAD_RIGHT:
if (progress >= getMax()) break; increment = isLayoutRtl() ? -increment : increment;
animateSetProgress(progress + mKeyProgressIncrement); int progress = getProgress() + increment;
onKeyChange(); if (progress > -mKeyProgressIncrement &&
return true; progress < getMax() + mKeyProgressIncrement) {
animateSetProgress(progress);
onKeyChange();
return true;
}
} }
} }