diff options
author | Nick Chalko <nchalko@google.com> | 2017-05-04 14:37:34 -0700 |
---|---|---|
committer | Nick Chalko <nchalko@google.com> | 2017-05-05 06:18:44 -0700 |
commit | 3dfa929b24f38ac7836450176d88ceab41dc6ac5 (patch) | |
tree | 675a324760c582713e2e0080775ea17357f75b65 /src/com/android/tv/dvr/ui/DvrStopRecordingFragment.java | |
parent | fddf3fd148c1fc94c48ee5684e47dbb56512e758 (diff) | |
download | TV-3dfa929b24f38ac7836450176d88ceab41dc6ac5.tar.gz |
Sync to ub-tv-dev at f0024d79653da8c8999a91f995431a645a6ff4a2
Change-Id: I4199ec04cacb4a78be58b85302a39d917658dc28
Diffstat (limited to 'src/com/android/tv/dvr/ui/DvrStopRecordingFragment.java')
-rw-r--r-- | src/com/android/tv/dvr/ui/DvrStopRecordingFragment.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/com/android/tv/dvr/ui/DvrStopRecordingFragment.java b/src/com/android/tv/dvr/ui/DvrStopRecordingFragment.java index c3867886..b476fff7 100644 --- a/src/com/android/tv/dvr/ui/DvrStopRecordingFragment.java +++ b/src/com/android/tv/dvr/ui/DvrStopRecordingFragment.java @@ -33,7 +33,7 @@ import com.android.tv.data.Channel; import com.android.tv.data.ChannelDataManager; import com.android.tv.dvr.DvrDataManager; import com.android.tv.dvr.DvrDataManager.ScheduledRecordingListener; -import com.android.tv.dvr.ScheduledRecording; +import com.android.tv.dvr.data.ScheduledRecording; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -131,15 +131,8 @@ public class DvrStopRecordingFragment extends DvrGuidedStepFragment { String title = getString(R.string.dvr_stop_recording_dialog_title); String description; if (mStopReason == REASON_ON_CONFLICT) { - String programTitle = mSchedule.getProgramTitle(); - if (TextUtils.isEmpty(programTitle)) { - ChannelDataManager channelDataManager = - TvApplication.getSingletons(getActivity()).getChannelDataManager(); - Channel channel = channelDataManager.getChannel(mSchedule.getChannelId()); - programTitle = channel.getDisplayName(); - } description = getString(R.string.dvr_stop_recording_dialog_description_on_conflict, - mSchedule.getProgramTitle()); + mSchedule.getProgramDisplayTitle(getContext())); } else { description = getString(R.string.dvr_stop_recording_dialog_description); } |