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

Commit ad096b3f authored by Michael Chan's avatar Michael Chan Committed by Android (Google) Code Review
Browse files

Merge "Undim past events in AlertActivity" into jb-dev

parents e01dd0c8 1acea531

res/values/colors.xml

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ 


    <color name="alert_event_title">#FFFFFFFF</color>

    <color name="alert_event_other">#FF999999</color>

    <color name="alert_past_event">#8F999999</color>



    <color name="appwidget_row_in_progress">#6633b5e5</color>

src/com/android/calendar/alerts/AlertAdapter.java

+6 −14
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


package com.android.calendar.alerts;



import com.android.calendar.R;

import com.android.calendar.Utils;



import android.content.Context;

import android.content.res.Resources;

import android.database.Cursor;
@@ -30,6 +27,9 @@ import android.view.View; 
import android.widget.ResourceCursorAdapter;

import android.widget.TextView;



import com.android.calendar.R;

import com.android.calendar.Utils;



import java.util.Locale;

import java.util.TimeZone;
@@ -38,7 +38,6 @@ public class AlertAdapter extends ResourceCursorAdapter { 
    private static boolean mFirstTime = true;

    private static int mTitleColor;

    private static int mOtherColor; // non-title fields

    private static int mPastEventColor;



    public AlertAdapter(Context context, int resource) {

        super(context, resource, null);
@@ -85,21 +84,14 @@ public class AlertAdapter extends ResourceCursorAdapter { 
        TextView whenView = (TextView) view.findViewById(R.id.when);

        TextView whereView = (TextView) view.findViewById(R.id.where);

        if (mFirstTime) {

            mPastEventColor = res.getColor(R.color.alert_past_event);

            mTitleColor = res.getColor(R.color.alert_event_title);

            mOtherColor = res.getColor(R.color.alert_event_other);

            mFirstTime = false;

        }



        if (endMillis < System.currentTimeMillis()) {

            titleView.setTextColor(mPastEventColor);

            whenView.setTextColor(mPastEventColor);

            whereView.setTextColor(mPastEventColor);

        } else {

        titleView.setTextColor(mTitleColor);

        whenView.setTextColor(mOtherColor);

        whereView.setTextColor(mOtherColor);

        }



        // What

        if (eventName == null || eventName.length() == 0) {