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

Commit 783835bc authored by Michael Chan's avatar Michael Chan
Browse files

Revert day header background back to gray for past days 

This (mostly) reverts commit e927121e.

Change-Id: I3c27c5d0504a599792e274c70da1f9f65aa97c28
parent bbaccb4f

res/layout-sw600dp/agenda_day.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->

<GridLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:background="@drawable/agenda_item_bg_primary"

    android:background="@color/agenda_day_bar_background_color"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:columnCount="2"

src/com/android/calendar/agenda/AgendaByDayAdapter.java

+10 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ public class AgendaByDayAdapter extends BaseAdapter { 
        TextView dayView;

        TextView dateView;

        int julianDay;

        boolean grayed;

    }



    private final Runnable mTZUpdater = new Runnable() {
@@ -191,6 +192,7 @@ public class AgendaByDayAdapter extends BaseAdapter { 
                holder.dayView = (TextView) agendaDayView.findViewById(R.id.day);

                holder.dateView = (TextView) agendaDayView.findViewById(R.id.date);

                holder.julianDay = row.mDay;

                holder.grayed = false;

                agendaDayView.setTag(holder);

            }
@@ -230,6 +232,14 @@ public class AgendaByDayAdapter extends BaseAdapter { 
            holder.dayView.setText(dayViewText);

            holder.dateView.setText(dateViewText);



            // Set the background of the view, it is grayed for day that are in the past and today

            if (row.mDay > mTodayJulianDay) {

                agendaDayView.setBackgroundResource(R.drawable.agenda_item_bg_primary);

                holder.grayed = false;

            } else {

                agendaDayView.setBackgroundResource(R.drawable.agenda_item_bg_secondary);

                holder.grayed = true;

            }

            return agendaDayView;

        } else if (row.mType == TYPE_MEETING) {

            View itemView = mAgendaAdapter.getView(row.mPosition, convertView, parent);

src/com/android/calendar/agenda/AgendaListView.java

+8 −1
Original line number Diff line number Diff line
@@ -140,7 +140,14 @@ public class AgendaListView extends ListView implements OnItemClickListener { 
        for (int i = 0; i < childCount; ++i) {

            View listItem = getChildAt(i);

            Object o = listItem.getTag();

            if (o instanceof AgendaAdapter.ViewHolder) {

            if (o instanceof AgendaByDayAdapter.ViewHolder) {

                // day view - check if day in the past and not grayed yet

                AgendaByDayAdapter.ViewHolder holder = (AgendaByDayAdapter.ViewHolder) o;

                if (holder.julianDay <= todayJulianDay && !holder.grayed) {

                    needUpdate = true;

                    break;

                }

            } else if (o instanceof AgendaAdapter.ViewHolder) {

                // meeting view - check if event in the past or started already and not grayed yet

                // All day meetings for a day are grayed out

                AgendaAdapter.ViewHolder holder = (AgendaAdapter.ViewHolder) o;