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

am 7781647a: Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev

Browse Source 
* commit '7781647aa90d7d7a070ecd79e52c2d8a11b59b5c':
  Fix auto-advance regression in radial time picker
This commit is contained in:
Alan Viverette
2014-12-09 00:18:40 +00:00
committed by Android Git Automerger
parent 8dd185b08f 7781647aa9
commit 4b944f3ab8
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
core/java/android/widget/RadialTimePickerView.java
View File

@@ -1246,37 +1246,40 @@ public class RadialTimePickerView extends View implements View.OnTouchListener {
}
final int[] selectionDegrees = mSelectionDegrees;
int type = -1;
int newValue = -1;
final int type;
final int newValue;
final boolean valueChanged;
if (mShowHours) {
final int snapDegrees = snapOnly30s(degrees, 0) % 360;
if (forceSelection
|| selectionDegrees[HOURS] != snapDegrees
valueChanged = selectionDegrees[HOURS] != snapDegrees
|| selectionDegrees[HOURS_INNER] != snapDegrees
|| wasOnInnerCircle != mIsOnInnerCircle) {
selectionDegrees[HOURS] = snapDegrees;
selectionDegrees[HOURS_INNER] = snapDegrees;
|| wasOnInnerCircle != mIsOnInnerCircle;
type = HOURS;
newValue = getCurrentHour();
}
selectionDegrees[HOURS] = snapDegrees;
selectionDegrees[HOURS_INNER] = snapDegrees;
type = HOURS;
newValue = getCurrentHour();
} else {
final int snapDegrees = snapPrefer30s(degrees) % 360;
if (forceSelection || selectionDegrees[MINUTES] != snapDegrees) {
selectionDegrees[MINUTES] = snapDegrees;
valueChanged = selectionDegrees[MINUTES] != snapDegrees;
type = MINUTES;
newValue = getCurrentMinute();
}
selectionDegrees[MINUTES] = snapDegrees;
type = MINUTES;
newValue = getCurrentMinute();
}
if (newValue != -1) {
if (valueChanged || forceSelection || autoAdvance) {
// Fire the listener even if we just need to auto-advance.
if (mListener != null) {
mListener.onValueSelected(type, newValue, autoAdvance);
}
performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK);
invalidate();
// Only provide feedback if the value actually changed.
if (valueChanged || forceSelection) {
performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK);
invalidate();
}
return true;
}