diff options
| author | Adrian Roos <roosa@google.com> | 2017-05-05 20:16:08 +0000 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2017-05-05 20:16:08 +0000 |
| commit | 721bd0da688cd552737fbb753a00597f95103b95 (patch) | |
| tree | 36da88c2d4365be7ee0a4dd0c732b9399d1c55ad /src/com/android/tv/dvr/ui/DvrConflictFragment.java | |
| parent | 3dfa929b24f38ac7836450176d88ceab41dc6ac5 (diff) | |
| download | TV-721bd0da688cd552737fbb753a00597f95103b95.tar.gz | |
Revert "Sync to ub-tv-dev at f0024d79653da8c8999a91f995431a645a6ff4a2"
This reverts commit 3dfa929b24f38ac7836450176d88ceab41dc6ac5.
Change-Id: I1c76f626d966b8d4793a19677a8840ed0424d3a7
Diffstat (limited to 'src/com/android/tv/dvr/ui/DvrConflictFragment.java')
| -rw-r--r-- | src/com/android/tv/dvr/ui/DvrConflictFragment.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/tv/dvr/ui/DvrConflictFragment.java b/src/com/android/tv/dvr/ui/DvrConflictFragment.java index 5985f56f..e7be4d0a 100644 --- a/src/com/android/tv/dvr/ui/DvrConflictFragment.java +++ b/src/com/android/tv/dvr/ui/DvrConflictFragment.java @@ -34,9 +34,10 @@ import com.android.tv.TvApplication; import com.android.tv.common.SoftPreconditions; import com.android.tv.data.Channel; import com.android.tv.data.Program; -import com.android.tv.dvr.recorder.ConflictChecker; -import com.android.tv.dvr.recorder.ConflictChecker.OnUpcomingConflictChangeListener; -import com.android.tv.dvr.data.ScheduledRecording; +import com.android.tv.dvr.ConflictChecker; +import com.android.tv.dvr.ConflictChecker.OnUpcomingConflictChangeListener; +import com.android.tv.dvr.DvrUiHelper; +import com.android.tv.dvr.ScheduledRecording; import com.android.tv.util.Utils; import java.util.ArrayList; |