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

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

Browse Source 
* commit '73d28900e96b84b2833954669f1db95326f3d6e0':
  Consider RTL layout in DPAD navigation in AbsSeekBar
This commit is contained in:
Alan Viverette
2014-12-03 00:29:46 +00:00
committed by Android Git Automerger
parent 7ef0d514c3 73d28900e9
commit 5c39807a57
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

@@ -695,19 +695,20 @@ 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);
onKeyChange();
return true;
increment = isLayoutRtl() ? -increment : increment;
int progress = getProgress() + increment;
if (progress > 0 && progress < getMax()) {
setProgress(progress, true);
onKeyChange();
return true;
}
break;
}
}