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

am 07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev

Browse Source 
* commit '07e867a059a6bef19fb92663d02a03a90cd356e8':
  Fix TimePicker.setCurrentHour() when argument is 0
This commit is contained in:
Alan Viverette
2014-09-16 23:30:10 +00:00
committed by Android Git Automerger
parent d82fa0d3c8 4813482324
commit 5a4b2bf9b2
1 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,6 +137,11 @@ public class RadialTimePickerView extends View implements View.OnTouchListener {
private boolean mIs24HourMode;
private boolean mShowHours;
/**
* When in 24-hour mode, indicates that the current hour is between
* 1 and 12 (inclusive).
*/
private boolean mIsOnInnerCircle;
private int mXCenter;
@@ -513,49 +518,53 @@ public class RadialTimePickerView extends View implements View.OnTouchListener {
mListener = listener;
}
/**
* Sets the current hour in 24-hour time.
*
* @param hour the current hour between 0 and 23 (inclusive)
*/
public void setCurrentHour(int hour) {
final int degrees = (hour % 12) * DEGREES_FOR_ONE_HOUR;
mSelectionDegrees[HOURS] = degrees;
mSelectionDegrees[HOURS_INNER] = degrees;
mAmOrPm = ((hour % 24) < 12) ? AM : PM;
// 0 is 12 AM (midnight) and 12 is 12 PM (noon).
mAmOrPm = (hour == 0 || (hour % 24) < 12) ? AM : PM;
if (mIs24HourMode) {
mIsOnInnerCircle = (mAmOrPm == AM);
// Inner circle is 1 through 12.
mIsOnInnerCircle = hour >= 1 && hour <= 12;
} else {
mIsOnInnerCircle = false;
}
initData();
updateLayoutData();
invalidate();
}
// Return hours in 0-23 range
/**
* Returns the current hour in 24-hour time.
*
* @return the current hour between 0 and 23 (inclusive)
*/
public int getCurrentHour() {
int hours =
mSelectionDegrees[mIsOnInnerCircle ? HOURS_INNER : HOURS] / DEGREES_FOR_ONE_HOUR;
int hour = (mSelectionDegrees[mIsOnInnerCircle ?
HOURS_INNER : HOURS] / DEGREES_FOR_ONE_HOUR) % 12;
if (mIs24HourMode) {
if (mIsOnInnerCircle) {
hours = hours % 12;
if (hours == 0) {
hours = 12;
}
} else {
if (hours != 0) {
hours += 12;
}
}
} else {
hours = hours % 12;
if (hours == 0) {
if (mAmOrPm == PM) {
hours = 12;
}
} else {
if (mAmOrPm == PM) {
hours += 12;
}
// Convert the 12-hour value into 24-hour time based on where the
// selector is positioned.
if (mIsOnInnerCircle && hour == 0) {
// Inner circle is 1 through 12.
hour = 12;
} else if (hour != 0) {
// Outer circle is 13 through 23 and 0.
hour += 12;
}
} else if (mAmOrPm == PM) {
hour += 12;
}
return hours;
return hour;
}
public void setCurrentMinute(int minute) {