summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2011-03-14 18:30:39 -0700
committerSvetoslav Ganov <svetoslavganov@google.com>2011-03-14 18:34:55 -0700
commit1a730dcc4fdf78f97b3640f20323be5f2d5c4516 (patch)
treef9705a4218cd2a6ebb29dead5ac5592fbb10f84a
parent132bb659b643348f29292810e42800441df41ceb (diff)
downloadframeworks_base-1a730dcc4fdf78f97b3640f20323be5f2d5c4516.zip
frameworks_base-1a730dcc4fdf78f97b3640f20323be5f2d5c4516.tar.gz
frameworks_base-1a730dcc4fdf78f97b3640f20323be5f2d5c4516.tar.bz2
Tapping on the week number sends the DatePicker to epoch start.
bug:4093343 1. If getting a day from location in a week view fails the out date was cleared but the client was unaware of that failure. I have added a return value indicating where getting the day from locations was successfull. Change-Id: I566a9ee33dfe2e64300a4b50dacc652114e01442
-rw-r--r--core/java/android/widget/CalendarView.java15
1 files changed, 10 insertions, 5 deletions
diff --git a/core/java/android/widget/CalendarView.java b/core/java/android/widget/CalendarView.java
index 13a407f..f8c76f2 100644
--- a/core/java/android/widget/CalendarView.java
+++ b/core/java/android/widget/CalendarView.java
@@ -1066,7 +1066,10 @@ public class CalendarView extends FrameLayout {
public boolean onTouch(View v, MotionEvent event) {
if (mListView.isEnabled() && mGestureDetector.onTouchEvent(event)) {
WeekView weekView = (WeekView) v;
- weekView.getDayFromLocation(event.getX(), mTempDate);
+ // if we cannot find a day for the given location we are done
+ if (!weekView.getDayFromLocation(event.getX(), mTempDate)) {
+ return true;
+ }
// it is possible that the touched day is outside the valid range
// we draw whole weeks but range end can fall not on the week end
if (mTempDate.before(mMinDate) || mTempDate.after(mMaxDate)) {
@@ -1271,21 +1274,23 @@ public class CalendarView extends FrameLayout {
/**
* Calculates the day that the given x position is in, accounting for
- * week number. Returns a Time referencing that day or null if
+ * week number.
*
- * @param x The x position of the touch eventy
+ * @param x The x position of the touch event.
+ * @return True if a day was found for the given location.
*/
- public void getDayFromLocation(float x, Calendar outCalendar) {
+ public boolean getDayFromLocation(float x, Calendar outCalendar) {
int dayStart = mShowWeekNumber ? mWidth / mNumCells : 0;
if (x < dayStart || x > mWidth) {
outCalendar.clear();
- return;
+ return false;
}
// Selection is (x - start) / (pixels/day) == (x -s) * day / pixels
int dayPosition = (int) ((x - dayStart) * mDaysPerWeek
/ (mWidth - dayStart));
outCalendar.setTimeInMillis(mFirstDay.getTimeInMillis());
outCalendar.add(Calendar.DAY_OF_MONTH, dayPosition);
+ return true;
}
@Override