diff options
| author | Danesh M <daneshm90@gmail.com> | 2014-12-08 13:32:14 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-18 13:52:41 -0700 |
| commit | 4c1cb1bec37d25fdbaa98039cf56fcd125e5eba0 (patch) | |
| tree | 4aeef2532cb0d6107dcc7d0494e551faf9e65d40 /src | |
| parent | e2f50583236c11ddf78866b32222824e658be444 (diff) | |
| download | android_packages_apps_Calendar-4c1cb1bec37d25fdbaa98039cf56fcd125e5eba0.tar.gz android_packages_apps_Calendar-4c1cb1bec37d25fdbaa98039cf56fcd125e5eba0.tar.bz2 android_packages_apps_Calendar-4c1cb1bec37d25fdbaa98039cf56fcd125e5eba0.zip | |
Calendar : Add lollipop ux
Change-Id: Ibc7bc2267b464c4f8c3d07c2406ed2cf87e7febb
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/calendar/AllInOneActivity.java | 25 | ||||
| -rw-r--r-- | src/com/android/calendar/DayOfMonthDrawable.java | 5 | ||||
| -rw-r--r-- | src/com/android/calendar/EventInfoActivity.java | 2 |
3 files changed, 17 insertions, 15 deletions
diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java index 3c869574..d9e1a9ca 100644 --- a/src/com/android/calendar/AllInOneActivity.java +++ b/src/com/android/calendar/AllInOneActivity.java @@ -823,6 +823,19 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH return true; } + public void createEvent(View v) { + Time t = new Time(); + t.set(mController.getTime()); + if (t.minute > 30) { + t.hour++; + t.minute = 0; + } else if (t.minute > 0 && t.minute < 30) { + t.minute = 30; + } + mController.sendEventRelatedEvent( + this, EventType.CREATE_EVENT, -1, t.toMillis(true), 0, 0, 0, -1); + } + @Override public boolean onOptionsItemSelected(MenuItem item) { Time t = null; @@ -837,18 +850,6 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH t = new Time(mTimeZone); t.setToNow(); extras |= CalendarController.EXTRA_GOTO_TODAY; - } else if (itemId == R.id.action_create_event) { - t = new Time(); - t.set(mController.getTime()); - if (t.minute > 30) { - t.hour++; - t.minute = 0; - } else if (t.minute > 0 && t.minute < 30) { - t.minute = 30; - } - mController.sendEventRelatedEvent( - this, EventType.CREATE_EVENT, -1, t.toMillis(true), 0, 0, 0, -1); - return true; } else if (itemId == R.id.action_select_visible_calendars) { mController.sendEvent(this, EventType.LAUNCH_SELECT_VISIBLE_CALENDARS, null, null, 0, 0); diff --git a/src/com/android/calendar/DayOfMonthDrawable.java b/src/com/android/calendar/DayOfMonthDrawable.java index 461ab317..0c17f952 100644 --- a/src/com/android/calendar/DayOfMonthDrawable.java +++ b/src/com/android/calendar/DayOfMonthDrawable.java @@ -34,16 +34,17 @@ public class DayOfMonthDrawable extends Drawable { private String mDayOfMonth = "1"; private final Paint mPaint; private final Rect mTextBounds = new Rect(); - private static float mTextSize = 14; + private static float mTextSize = 12; public DayOfMonthDrawable(Context c) { mTextSize = c.getResources().getDimension(R.dimen.today_icon_text_size); mPaint = new Paint(); mPaint.setAlpha(255); - mPaint.setColor(0xFF777777); + mPaint.setColor(0xFF000000); mPaint.setTypeface(Typeface.DEFAULT_BOLD); mPaint.setTextSize(mTextSize); mPaint.setTextAlign(Paint.Align.CENTER); + mPaint.setAntiAlias(true); } @Override diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java index 9b136bd0..b5279fb4 100644 --- a/src/com/android/calendar/EventInfoActivity.java +++ b/src/com/android/calendar/EventInfoActivity.java @@ -145,7 +145,7 @@ public class EventInfoActivity extends Activity { // Remove the application title ActionBar bar = getActionBar(); if (bar != null) { - bar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_SHOW_HOME); + bar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP); } // Create a new fragment if none exists |