diff options
Diffstat (limited to 'src/com/android/tv/dvr/ui/list/SeriesScheduleRowAdapter.java')
-rw-r--r-- | src/com/android/tv/dvr/ui/list/SeriesScheduleRowAdapter.java | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/com/android/tv/dvr/ui/list/SeriesScheduleRowAdapter.java b/src/com/android/tv/dvr/ui/list/SeriesScheduleRowAdapter.java index 6b6de8b8..3b493774 100644 --- a/src/com/android/tv/dvr/ui/list/SeriesScheduleRowAdapter.java +++ b/src/com/android/tv/dvr/ui/list/SeriesScheduleRowAdapter.java @@ -31,8 +31,8 @@ import com.android.tv.common.SoftPreconditions; import com.android.tv.data.Program; import com.android.tv.dvr.DvrDataManager; import com.android.tv.dvr.DvrManager; -import com.android.tv.dvr.data.ScheduledRecording; -import com.android.tv.dvr.data.SeriesRecording; +import com.android.tv.dvr.ScheduledRecording; +import com.android.tv.dvr.SeriesRecording; import com.android.tv.dvr.ui.list.SchedulesHeaderRow.SeriesRecordingHeaderRow; import com.android.tv.util.Utils; @@ -46,7 +46,7 @@ import java.util.Map; * An adapter for series schedule row. */ @TargetApi(Build.VERSION_CODES.N) -class SeriesScheduleRowAdapter extends ScheduleRowAdapter { +public class SeriesScheduleRowAdapter extends ScheduleRowAdapter { private static final String TAG = "SeriesRowAdapter"; private static final boolean DEBUG = false; @@ -96,7 +96,7 @@ class SeriesScheduleRowAdapter extends ScheduleRowAdapter { Collections.sort(sortedPrograms); List<EpisodicProgramRow> rows = new ArrayList<>(); mHeaderRow = new SeriesRecordingHeaderRow(mSeriesRecording.getTitle(), - null, sortedPrograms.size(), mSeriesRecording, programs); + null, sortedPrograms.size(), mSeriesRecording); for (Program program : sortedPrograms) { ScheduledRecording schedule = mDataManager.getScheduledRecordingForProgramId(program.getId()); @@ -145,7 +145,7 @@ class SeriesScheduleRowAdapter extends ScheduleRowAdapter { if (index != -1) { EpisodicProgramRow row = (EpisodicProgramRow) get(index); if (!row.isStartRecordingRequested()) { - setScheduleToRow(row, schedule); + row.setSchedule(schedule); notifyArrayItemRangeChanged(index, 1); } } @@ -195,10 +195,12 @@ class SeriesScheduleRowAdapter extends ScheduleRowAdapter { if (!isStartOrStopRequested()) { executePendingUpdate(); } - setScheduleToRow(row, schedule); + row.setSchedule(schedule); } + } else if (willBeKept(schedule)) { + row.setSchedule(schedule); } else { - setScheduleToRow(row, schedule); + row.setSchedule(null); } notifyArrayItemRangeChanged(index, 1); } @@ -211,14 +213,6 @@ class SeriesScheduleRowAdapter extends ScheduleRowAdapter { } } - private void setScheduleToRow(ScheduleRow row, ScheduledRecording schedule) { - if (schedule != null && willBeKept(schedule)) { - row.setSchedule(schedule); - } else { - row.setSchedule(null); - } - } - private int findRowIndexByProgramId(long programId) { for (int i = 0; i < size(); i++) { Object item = get(i); |