Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00671d5b authored by Michael Chan's avatar Michael Chan
Browse files

b/5641558 Decrease the event size for week view in tablet 

Change-Id: Ife4062ceb9b897bbb4ee5120307d4db2cfc00eb9
parent 8eda745b

res/values-w1024dp-h552dp/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 
    <dimen name="hours_text_size">16sp</dimen>

    <dimen name="allday_text_size">14sp</dimen>

    <dimen name="ampm_text_size">12sp</dimen>

    <dimen name="event_text_size">14sp</dimen>

    <dimen name="day_view_event_text_size">14sp</dimen>

    <dimen name="week_view_event_text_size">12sp</dimen>

    <dimen name="event_text_vertical_margin">4dp</dimen>

    <dimen name="event_text_horizontal_margin">6dp</dimen>

    <dimen name="event_min_height">30dip</dimen>

res/values-w600dp-h976dp/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 
    <dimen name="hours_text_size">16sp</dimen>

    <dimen name="allday_text_size">14sp</dimen>

    <dimen name="ampm_text_size">12sp</dimen>

    <dimen name="event_text_size">14sp</dimen>

    <dimen name="day_view_event_text_size">14sp</dimen>

    <dimen name="week_view_event_text_size">12sp</dimen>

    <dimen name="event_text_vertical_margin">4dp</dimen>

    <dimen name="event_text_horizontal_margin">6dp</dimen>

    <dimen name="event_min_height">30dip</dimen>

res/values/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 
    <dimen name="hours_text_size">12sp</dimen>

    <dimen name="allday_text_size">12sp</dimen>

    <dimen name="ampm_text_size">10sp</dimen>

    <dimen name="event_text_size">12sp</dimen>

    <dimen name="day_view_event_text_size">12sp</dimen>

    <dimen name="week_view_event_text_size">12sp</dimen>

    <dimen name="event_text_vertical_margin">2dp</dimen>

    <dimen name="event_text_horizontal_margin">4dp</dimen>

    <dimen name="event_min_height">24dip</dimen>

src/com/android/calendar/DayView.java

+9 −3
Original line number Diff line number Diff line
@@ -611,6 +611,7 @@ public class DayView extends View implements View.OnCreateContextMenuListener, 
        mResources = context.getResources();

        mCreateNewEventString = mResources.getString(R.string.event_create);

        mNewEventHintString = mResources.getString(R.string.day_view_new_event_hint);

        mNumDays = numDays;



        DATE_HEADER_FONT_SIZE = (int) mResources.getDimension(R.dimen.date_header_text_size);

        DAY_HEADER_FONT_SIZE = (int) mResources.getDimension(R.dimen.day_label_text_size);
@@ -623,7 +624,13 @@ public class DayView extends View implements View.OnCreateContextMenuListener, 
        HOURS_LEFT_MARGIN = (int) mResources.getDimension(R.dimen.hours_left_margin);

        HOURS_RIGHT_MARGIN = (int) mResources.getDimension(R.dimen.hours_right_margin);

        MULTI_DAY_HEADER_HEIGHT = (int) mResources.getDimension(R.dimen.day_header_height);

        EVENT_TEXT_FONT_SIZE = (int) mResources.getDimension(R.dimen.event_text_size);

        int eventTextSizeId;

        if (mNumDays == 1) {

            eventTextSizeId = R.dimen.day_view_event_text_size;

        } else {

            eventTextSizeId = R.dimen.week_view_event_text_size;

        }

        EVENT_TEXT_FONT_SIZE = (int) mResources.getDimension(eventTextSizeId);

        NEW_EVENT_HINT_FONT_SIZE = (int) mResources.getDimension(R.dimen.new_event_hint_text_size);

        MIN_EVENT_HEIGHT = mResources.getDimension(R.dimen.event_min_height);

        MIN_UNEXPANDED_ALLDAY_EVENT_HEIGHT = MIN_EVENT_HEIGHT;
@@ -682,7 +689,7 @@ public class DayView extends View implements View.OnCreateContextMenuListener, 
            }

        }

        HOURS_MARGIN = HOURS_LEFT_MARGIN + HOURS_RIGHT_MARGIN;

        DAY_HEADER_HEIGHT = numDays == 1 ? ONE_DAY_HEADER_HEIGHT : MULTI_DAY_HEADER_HEIGHT;

        DAY_HEADER_HEIGHT = mNumDays == 1 ? ONE_DAY_HEADER_HEIGHT : MULTI_DAY_HEADER_HEIGHT;



        mCurrentTimeLine = mResources.getDrawable(R.drawable.timeline_indicator_holo_light);

        mCurrentTimeAnimateLine = mResources
@@ -709,7 +716,6 @@ public class DayView extends View implements View.OnCreateContextMenuListener, 
        mViewSwitcher = viewSwitcher;

        mGestureDetector = new GestureDetector(context, new CalendarGestureListener());

        mScaleGestureDetector = new ScaleGestureDetector(getContext(), this);

        mNumDays = numDays;

        if (mCellHeight == 0) {

            mCellHeight = Utils.getSharedPreference(mContext,

                    GeneralPreferences.KEY_DEFAULT_CELL_HEIGHT, DEFAULT_CELL_HEIGHT);