Sync to match Live Channels 1.15(ncis)

aka ub-tv-dev at a73a150bb7d0d1ce867ef980c6ac8411899d40ad

Bug: 64021596
Change-Id: I7c544fd15e2c58784f8babc31877ad0dfeebb4c0

1 files changed, 42 insertions, 6 deletions

diff --git a/src/com/android/tv/dvr/ui/DvrConflictFragment.java b/src/com/android/tv/dvr/ui/DvrConflictFragment.java
index e7be4d0a..6f362e68 100644
--- a/src/com/android/tv/dvr/ui/DvrConflictFragment.java
+++ b/src/com/android/tv/dvr/ui/DvrConflictFragment.java
@@ -34,10 +34,9 @@ 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.ConflictChecker;
-import com.android.tv.dvr.ConflictChecker.OnUpcomingConflictChangeListener;
-import com.android.tv.dvr.DvrUiHelper;
-import com.android.tv.dvr.ScheduledRecording;
+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.util.Utils;
 
 import java.util.ArrayList;
@@ -85,7 +84,7 @@ public abstract class DvrConflictFragment extends DvrGuidedStepFragment {
     }
 
     @Override
-    public void onGuidedActionClicked(GuidedAction action) {
+    public void onTrackedGuidedActionClicked(GuidedAction action) {
         if (action.getId() == ACTION_VIEW_SCHEDULES) {
             DvrUiHelper.startSchedulesActivityForOneTimeRecordingConflict(
                     getContext(), getConflicts());
@@ -93,6 +92,16 @@ public abstract class DvrConflictFragment extends DvrGuidedStepFragment {
         dismissDialog();
     }
 
+    @Override
+    public String getTrackerLabelForGuidedAction(GuidedAction action) {
+        long actionId = getId();
+        if (actionId == ACTION_VIEW_SCHEDULES) {
+            return "view-schedules";
+        } else {
+            return super.getTrackerLabelForGuidedAction(action);
+        }
+    }
+
     String getConflictDescription() {
         List<String> titles = new ArrayList<>();
         HashSet<String> titleSet = new HashSet<>();
@@ -185,6 +194,11 @@ public abstract class DvrConflictFragment extends DvrGuidedStepFragment {
             Drawable icon = getResources().getDrawable(R.drawable.ic_error_white_48dp, null);
             return new Guidance(title, descriptionPrefix + " " + description, null, icon);
         }
+
+        @Override
+        public String getTrackerPrefix() {
+            return "DvrProgramConflictFragment";
+        }
     }
 
     /**
@@ -236,6 +250,11 @@ public abstract class DvrConflictFragment extends DvrGuidedStepFragment {
             Drawable icon = getResources().getDrawable(R.drawable.ic_error_white_48dp, null);
             return new Guidance(title, descriptionPrefix + " " + description, null, icon);
         }
+
+        @Override
+        public String getTrackerPrefix() {
+            return "DvrChannelRecordConflictFragment";
+        }
     }
 
     /**
@@ -300,7 +319,7 @@ public abstract class DvrConflictFragment extends DvrGuidedStepFragment {
         }
 
         @Override
-        public void onGuidedActionClicked(GuidedAction action) {
+        public void onTrackedGuidedActionClicked(GuidedAction action) {
             if (action.getId() == ACTION_CANCEL) {
                 ConflictChecker checker = ((MainActivity) getContext()).getDvrConflictChecker();
                 if (checker != null) {
@@ -319,6 +338,23 @@ public abstract class DvrConflictFragment extends DvrGuidedStepFragment {
         }
 
         @Override
+        public String getTrackerPrefix() {
+            return "DvrChannelWatchConflictFragment";
+        }
+
+        @Override
+        public String getTrackerLabelForGuidedAction(GuidedAction action) {
+            long actionId = action.getId();
+            if (actionId == ACTION_CANCEL) {
+                return "cancel";
+            } else if (actionId == ACTION_DELETE_CONFLICT) {
+                return "delete";
+            } else {
+                return super.getTrackerLabelForGuidedAction(action);
+            }
+        }
+
+        @Override
         public void onDetach() {
             ConflictChecker checker = ((MainActivity) getContext()).getDvrConflictChecker();
             if (checker != null) {