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

Commit 2548f559 authored by Sean Stout's avatar Sean Stout
Browse files

ExpiredTimersActivity now checks that there are expired timers. 

Bug: 29792502

If no expired timers exist on creation, the activity finishes.

Change-Id: I575f0c74c1913360c2014b370abc4ee0418d6bde
parent eea5acbb

src/com/android/deskclock/timer/ExpiredTimersActivity.java

+11 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.widget.FrameLayout; 
import android.widget.TextView;



import com.android.deskclock.BaseActivity;

import com.android.deskclock.LogUtils;

import com.android.deskclock.R;

import com.android.deskclock.data.DataModel;

import com.android.deskclock.data.Timer;
@@ -60,6 +61,15 @@ public class ExpiredTimersActivity extends BaseActivity { 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        final List<Timer> expiredTimers = getExpiredTimers();



        // If no expired timers, finish

        if (expiredTimers.size() == 0) {

            LogUtils.i("No expired timers, skipping display.");

            finish();

            return;

        }



        setContentView(R.layout.expired_timers_activity);



        mExpiredTimersView = (ViewGroup) findViewById(R.id.expired_timers_list);
@@ -85,7 +95,7 @@ public class ExpiredTimersActivity extends BaseActivity { 
        }



        // Create views for each of the expired timers.

        for (Timer timer : getExpiredTimers()) {

        for (Timer timer : expiredTimers) {

            addTimer(timer);

        }