summaryrefslogtreecommitdiffstats
path: root/src/com/android/calendar/DayView.java
diff options
context:
space:
mode:
authoryingying <yingying@codeaurora.org>2014-02-21 17:17:44 +0800
committerAdnan <adnan@cyngn.com>2014-08-25 18:38:08 -0700
commit3dc108642c87bc85085e7b5dd40d0a227ead24ff (patch)
tree24807ecd9f7f8566b5ccd818401e00ff7617d471 /src/com/android/calendar/DayView.java
parentdb119896d65d9f7011b1d67b5ced7aded0d3d475 (diff)
downloadandroid_packages_apps_Calendar-3dc108642c87bc85085e7b5dd40d0a227ead24ff.tar.gz
android_packages_apps_Calendar-3dc108642c87bc85085e7b5dd40d0a227ead24ff.tar.bz2
android_packages_apps_Calendar-3dc108642c87bc85085e7b5dd40d0a227ead24ff.zip
Calendar: To display the complex lunar info.
Change-Id: Iae448e24c6d05bd7fde7873b3f575310a227112e
Diffstat (limited to 'src/com/android/calendar/DayView.java')
-rw-r--r--src/com/android/calendar/DayView.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/calendar/DayView.java b/src/com/android/calendar/DayView.java
index 7f6cbce6..381ed0c6 100644
--- a/src/com/android/calendar/DayView.java
+++ b/src/com/android/calendar/DayView.java
@@ -2619,7 +2619,14 @@ public class DayView extends View implements View.OnCreateContextMenuListener,
}
try {
- String display = service.getLunarDay(year, month, dateNum);
+ String[] lunarInfo = service.getLunarInfo(year, month, dateNum, true, false)
+ .split(service.getSeparationForMultiInfo());
+ String display = null;
+ if (lunarInfo.length > 1) {
+ display = lunarInfo[0] + "*";
+ } else {
+ display = lunarInfo[0];
+ }
if (!TextUtils.isEmpty(display)) {
canvas.drawText(display, x, y + DAY_HEADER_FONT_SIZE + 2, p);
}