Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1

Owen Lin · Android (Google) Code Review · commit 8bb56180d208 · 2011-11-22T17:44:52.000-08:00
diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java
@@ -1415,7 +1415,7 @@ public static Formatter formatDateRange(Context context, Formatter formatter, lo
             }
         }
 
-        if (noMonthDay && startMonthNum == endMonthNum) {
+        if (noMonthDay && startMonthNum == endMonthNum && startYear == endYear) {
             // Example: "January, 2008"
             return formatter.format("%s", startDate.format(defaultDateFormat));
         }

Original file line number	Diff line number	Diff line change
`@@ -1415,7 +1415,7 @@ public static Formatter formatDateRange(Context context, Formatter formatter, lo`
`1415`	`1415`	`}`
`1416`	`1416`	`}`
`1417`	`1417`
`1418`		`- if (noMonthDay && startMonthNum == endMonthNum) {`
	`1418`	`+ if (noMonthDay && startMonthNum == endMonthNum && startYear == endYear) {`
`1419`	`1419`	`// Example: "January, 2008"`
`1420`	`1420`	`return formatter.format("%s", startDate.format(defaultDateFormat));`
`1421`	`1421`	`}`