diff options
| author | Shraddha Basantwani <shraddha.basantwani@ittiam.com> | 2019-02-26 16:03:03 +0530 |
|---|---|---|
| committer | Shraddha Basantwani <shraddha.basantwani@ittiam.com> | 2019-11-18 13:32:44 +0530 |
| commit | fc3f2d9eadeb434e4e77253ece65e152779e9589 (patch) | |
| tree | a9b446823f68287accb253d3d0dd5ed0d48846e6 /src/com/android/tv/guide | |
| parent | 345d5fdf28c7316d522daa242e452b06473e5dac (diff) | |
| download | TV-fc3f2d9eadeb434e4e77253ece65e152779e9589.tar.gz | |
Start early and end late feature.
Programs can be recorded for extra time
Added 5 new tests to DvrDbSyncTest
Test: make RunTvRoboTests ROBOTEST_FILTER=DvrDbSyncTest
Bug: 71718009
Change-Id: I4e3c8fc0acc9b56982000d2dbde2364d523a30e3
Diffstat (limited to 'src/com/android/tv/guide')
| -rw-r--r-- | src/com/android/tv/guide/ProgramItemView.java | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/com/android/tv/guide/ProgramItemView.java b/src/com/android/tv/guide/ProgramItemView.java index 5ec293f7..b14d30ba 100644 --- a/src/com/android/tv/guide/ProgramItemView.java +++ b/src/com/android/tv/guide/ProgramItemView.java @@ -40,7 +40,9 @@ import com.android.tv.MainActivity; import com.android.tv.R; import com.android.tv.TvSingletons; import com.android.tv.analytics.Tracker; +import com.android.tv.app.LiveTvApplication; import com.android.tv.common.feature.CommonFeatures; +import com.android.tv.common.flags.DvrFlags; import com.android.tv.common.util.Clock; import com.android.tv.data.ChannelDataManager; import com.android.tv.data.api.Channel; @@ -82,6 +84,7 @@ public class ProgramItemView extends TextView { private final DvrManager mDvrManager; @Inject Clock mClock; @Inject ChannelDataManager mChannelDataManager; + @Inject DvrFlags mDvrFlags; private ProgramGuide mProgramGuide; private TableEntry mTableEntry; private int mMaxWidthForRipple; @@ -98,6 +101,7 @@ public class ProgramItemView extends TextView { public void onClick(final View view) { TableEntry entry = ((ProgramItemView) view).mTableEntry; Clock clock = ((ProgramItemView) view).mClock; + DvrFlags dvrFlags = ((ProgramItemView) view).mDvrFlags; if (entry == null) { // do nothing return; @@ -126,12 +130,18 @@ public class ProgramItemView extends TextView { if (entry.entryStartUtcMillis > clock.currentTimeMillis() && dvrManager.isProgramRecordable(entry.program)) { if (entry.scheduledRecording == null) { - DvrUiHelper.checkStorageStatusAndShowErrorMessage( - tvActivity, - channel.getInputId(), - () -> - DvrUiHelper.requestRecordingFutureProgram( - tvActivity, entry.program, false)); + if (!entry.program.isEpisodic() && + dvrFlags.startEarlyEndLateEnabled()) { + DvrUiHelper.startRecordingSettingsActivity(view.getContext(), + entry.program); + } else { + DvrUiHelper.checkStorageStatusAndShowErrorMessage( + tvActivity, + channel.getInputId(), + () -> + DvrUiHelper.requestRecordingFutureProgram( + tvActivity, entry.program, false)); + } } else { dvrManager.removeScheduledRecording(entry.scheduledRecording); String msg = |