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

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

Browse Source 
Change-Id: Icb394ddc92eb64732993ef345284e63c9844f76b
This commit is contained in:
Alan Viverette
2014-12-02 13:58:27 -08:00
parent 61a7b7cff5 850cdbe58c
commit 73d28900e9
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -695,20 +695,21 @@ 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;
setProgress(progress - mKeyProgressIncrement, true); // fallthrough
onKeyChange();
return true;
case KeyEvent.KEYCODE_DPAD_RIGHT: case KeyEvent.KEYCODE_DPAD_RIGHT:
if (progress >= getMax()) break; increment = isLayoutRtl() ? -increment : increment;
setProgress(progress + mKeyProgressIncrement, true); int progress = getProgress() + increment;
if (progress > 0 && progress < getMax()) {
setProgress(progress, true);
onKeyChange(); onKeyChange();
return true; return true;
} }
break;
}
} }
return super.onKeyDown(keyCode, event); return super.onKeyDown(keyCode, event);