No separate column for week number Closes #50 (95cc00c5) · Commits · e / os / android_packages_apps_Etar

res/values/colors.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -64,8 +64,8 @@
		<color name="month_day_number">#FF555555</color>
		<color name="month_mini_day_number">#FF000000</color>
		<color name="month_day_number_other">#FF999999</color>
		<color name="month_week_num_color">#FF999999</color>
		<color name="month_day_names_color">#FF999999</color>
		<color name="month_week_num_color">#41c3b1</color>
		<color name="month_day_names_color">#757575</color>
		<color name="month_today_number">#FF555555</color>
		<color name="month_event_color">#FF333333</color>
		<color name="month_event_extra_color">#FF666666</color>

src/com/android/calendar/month/MonthWeekEventsView.java

+5 −24

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ public class MonthWeekEventsView extends SimpleWeekView {
		private static int EVENT_RIGHT_PADDING = 4;
		private static int EVENT_BOTTOM_PADDING = 1;
		private static int TODAY_HIGHLIGHT_WIDTH = 2;
		private static int SPACING_WEEK_NUMBER = 24;
		private static int SPACING_WEEK_NUMBER = 0;
		private static boolean mInitialized = false;
		private static boolean mShowDetailsInMonth;
		private static boolean mShowTimeInMonth;
		@@ -200,9 +200,7 @@ public class MonthWeekEventsView extends SimpleWeekView {
		if (!mShowDetailsInMonth) {
		int numDays = mEvents.size();
		int effectiveWidth = mWidth - mPadding * 2;
		if (mShowWeekNum) {
		effectiveWidth -= SPACING_WEEK_NUMBER;
		}

		DNA_ALL_DAY_WIDTH = effectiveWidth / numDays - 2 * DNA_SIDE_PADDING;
		mDNAAllDayPaint.setStrokeWidth(DNA_ALL_DAY_WIDTH);
		mDayXs = new int[numDays];
		@@ -497,12 +495,7 @@ public class MonthWeekEventsView extends SimpleWeekView {
		private int computeDayLeftPosition(int day) {
		int effectiveWidth = mWidth;
		int x = 0;
		int xOffset = 0;
		if (mShowWeekNum) {
		xOffset = SPACING_WEEK_NUMBER + mPadding;
		effectiveWidth -= xOffset;
		}
		x = day * effectiveWidth / mNumDays + xOffset;
		x = day * effectiveWidth / mNumDays;
		return x;
		}

		@@ -512,16 +505,7 @@ public class MonthWeekEventsView extends SimpleWeekView {
		int count = 6 * 4;
		int wkNumOffset = 0;
		int i = 0;
		if (mShowWeekNum) {
		// This adds the first line separating the week number
		int xOffset = SPACING_WEEK_NUMBER + mPadding;
		count += 4;
		lines[i++] = xOffset;
		lines[i++] = 0;
		lines[i++] = xOffset;
		lines[i++] = mHeight;
		wkNumOffset++;
		}

		count += 4;
		lines[i++] = 0;
		lines[i++] = 0;
		@@ -944,16 +928,13 @@ public class MonthWeekEventsView extends SimpleWeekView {
		selectedPosition += 7;
		}
		int effectiveWidth = mWidth - mPadding * 2;
		effectiveWidth -= SPACING_WEEK_NUMBER;
		mSelectedLeft = selectedPosition * effectiveWidth / mNumDays + mPadding;
		mSelectedRight = (selectedPosition + 1) * effectiveWidth / mNumDays + mPadding;
		mSelectedLeft += SPACING_WEEK_NUMBER;
		mSelectedRight += SPACING_WEEK_NUMBER;
		}
		}

		public int getDayIndexFromLocation(float x) {
		int dayStart = mShowWeekNum ? SPACING_WEEK_NUMBER + mPadding : mPadding;
		int dayStart = mPadding;
		if (x < dayStart \|\| x > mWidth - mPadding) {
		return -1;
		}

src/com/android/calendar/month/SimpleDayPickerFragment.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -309,11 +309,8 @@ public class SimpleDayPickerFragment extends ListFragment implements OnScrollLis
		*/
		protected void updateHeader() {
		TextView label = (TextView) mDayNamesHeader.findViewById(R.id.wk_label);
		if (mShowWeekNumber) {
		label.setVisibility(View.VISIBLE);
		} else {
		label.setVisibility(View.GONE);
		}

		int offset = mFirstDayOfWeek - 1;
		for (int i = 1; i < 8; i++) {
		label = (TextView) mDayNamesHeader.getChildAt(i);

src/com/android/calendar/month/SimpleWeekView.java

+1 −22

Original line number	Diff line number	Diff line
		@@ -367,7 +367,7 @@ public class SimpleWeekView extends View {
		* in a day
		*/
		public Time getDayFromLocation(float x) {
		int dayStart = mShowWeekNum ? (mWidth - mPadding * 2) / mNumCells + mPadding : mPadding;
		int dayStart = mPadding;
		if (x < dayStart \|\| x > mWidth - mPadding) {
		return null;
		}
		@@ -433,17 +433,6 @@ public class SimpleWeekView extends View {

		int i = 0;
		int divisor = 2 * nDays;
		if (mShowWeekNum) {
		p.setTextSize(MINI_WK_NUMBER_TEXT_SIZE);
		p.setStyle(Style.FILL);
		p.setTextAlign(Align.CENTER);
		p.setAntiAlias(true);
		p.setColor(mWeekNumColor);
		int x = (mWidth - mPadding * 2) / divisor + mPadding;
		canvas.drawText(mDayNumbers[0], x, y, p);
		i++;
		}

		boolean isFocusMonth = mFocusDay[i];
		mMonthNumPaint.setColor(isFocusMonth ? mFocusMonthColor : mOtherMonthColor);
		mMonthNumPaint.setFakeBoldText(false);
		@@ -482,13 +471,6 @@ public class SimpleWeekView extends View {
		p.setColor(mTodayOutlineColor);
		canvas.drawRect(r, p);
		}
		if (mShowWeekNum) {
		p.setColor(mDaySeparatorColor);
		p.setStrokeWidth(DAY_SEPARATOR_WIDTH);

		int x = (mWidth - mPadding * 2) / mNumCells + mPadding;
		canvas.drawLine(x, 0, x, mHeight, p);
		}
		}

		@Override
		@@ -506,9 +488,6 @@ public class SimpleWeekView extends View {
		if (selectedPosition < 0) {
		selectedPosition += 7;
		}
		if (mShowWeekNum) {
		selectedPosition++;
		}
		mSelectedLeft = selectedPosition * (mWidth - mPadding * 2) / mNumCells
		+ mPadding;
		mSelectedRight = (selectedPosition + 1) * (mWidth - mPadding * 2) / mNumCells