1 files changed, 23 insertions, 27 deletions

diff --git a/src/com/android/tv/dvr/ui/list/ScheduleRowPresenter.java b/src/com/android/tv/dvr/ui/list/ScheduleRowPresenter.java
index dc4e3c41..1257e725 100644
--- a/src/com/android/tv/dvr/ui/list/ScheduleRowPresenter.java
+++ b/src/com/android/tv/dvr/ui/list/ScheduleRowPresenter.java
@@ -42,24 +42,25 @@ import com.android.tv.R;
 import com.android.tv.TvApplication;
 import com.android.tv.common.SoftPreconditions;
 import com.android.tv.data.Channel;
-import com.android.tv.dialog.HalfSizedDialogFragment;
 import com.android.tv.dvr.DvrManager;
 import com.android.tv.dvr.DvrScheduleManager;
-import com.android.tv.dvr.data.ScheduledRecording;
+import com.android.tv.dvr.DvrUiHelper;
+import com.android.tv.dvr.ScheduledRecording;
 import com.android.tv.dvr.ui.DvrStopRecordingFragment;
-import com.android.tv.dvr.ui.DvrUiHelper;
+import com.android.tv.dvr.ui.HalfSizedDialogFragment;
 import com.android.tv.util.ToastUtils;
 import com.android.tv.util.Utils;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * A RowPresenter for {@link ScheduleRow}.
  */
 @TargetApi(Build.VERSION_CODES.N)
-class ScheduleRowPresenter extends RowPresenter {
+public class ScheduleRowPresenter extends RowPresenter {
     private static final String TAG = "ScheduleRowPresenter";
 
     @Retention(RetentionPolicy.SOURCE)
@@ -344,9 +345,7 @@ class ScheduleRowPresenter extends RowPresenter {
         viewHolder.mInfoContainer.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (isInfoClickable(row)) {
-                    onInfoClicked(row);
-                }
+                onInfoClicked(row);
             }
         });
 
@@ -367,7 +366,8 @@ class ScheduleRowPresenter extends RowPresenter {
         viewHolder.mTimeView.setText(onGetRecordingTimeText(row));
         String programInfoText = onGetProgramInfoText(row);
         if (TextUtils.isEmpty(programInfoText)) {
-            int durationMins = Math.max(1, Utils.getRoundOffMinsFromMs(row.getDuration()));
+            int durationMins =
+                    Math.max((int) TimeUnit.MILLISECONDS.toMinutes(row.getDuration()), 1);
             programInfoText = mContext.getResources().getQuantityString(
                     R.plurals.dvr_schedules_recording_duration, durationMins, durationMins);
         }
@@ -403,7 +403,6 @@ class ScheduleRowPresenter extends RowPresenter {
         } else {
             viewHolder.whiteBackInfo();
         }
-        viewHolder.mInfoContainer.setFocusable(isInfoClickable(row));
         updateActionContainer(viewHolder, viewHolder.isSelected());
     }
 
@@ -455,13 +454,11 @@ class ScheduleRowPresenter extends RowPresenter {
     /**
      * Called when user click Info in {@link ScheduleRow}.
      */
-    protected void onInfoClicked(ScheduleRow row) {
-        DvrUiHelper.startDetailsActivity((Activity) mContext, row.getSchedule(), null, true);
-    }
-
-    private boolean isInfoClickable(ScheduleRow row) {
-        return row.getSchedule() != null
-                && (row.getSchedule().isNotStarted() || row.getSchedule().isInProgress());
+    protected void onInfoClicked(ScheduleRow scheduleRow) {
+        ScheduledRecording schedule = scheduleRow.getSchedule();
+        if (schedule != null) {
+            DvrUiHelper.startDetailsActivity((Activity) mContext, schedule, null, true);
+        }
     }
 
     /**
@@ -548,7 +545,7 @@ class ScheduleRowPresenter extends RowPresenter {
             // This row has been deleted.
             return;
         }
-        if (row.isRecordingInProgress() && !row.isStopRecordingRequested()) {
+        if (row.isOnAir() && row.isRecordingInProgress() && !row.isStopRecordingRequested()) {
             row.setStopRecordingRequested(true);
             mDvrManager.stopRecording(row.getSchedule());
             CharSequence deletedInfo = onGetProgramInfoText(row);
@@ -673,9 +670,10 @@ class ScheduleRowPresenter extends RowPresenter {
                             hideActionView(viewHolder.mFirstActionContainer, View.GONE);
                         }
                     };
-                    mLastFocusedViewId = R.id.info_container;
-                    SoftPreconditions.checkState(viewHolder.mInfoContainer.isFocusable(), TAG,
-                            "No focusable view in this row: " + viewHolder);
+                    if (mLastFocusedViewId == R.id.action_first_container
+                            || mLastFocusedViewId == R.id.action_second_container) {
+                        mLastFocusedViewId = R.id.info_container;
+                    }
                     break;
             }
             View view = viewHolder.view.findViewById(mLastFocusedViewId);
@@ -685,10 +683,8 @@ class ScheduleRowPresenter extends RowPresenter {
                 // requestFocus() explicitly.
                 if (view.hasFocus()) {
                     viewHolder.mPendingAnimationRunnable.run();
-                } else if (view.isFocusable()){
-                    view.requestFocus();
                 } else {
-                    viewHolder.view.requestFocus();
+                    view.requestFocus();
                 }
             }
         } else {
@@ -741,10 +737,10 @@ class ScheduleRowPresenter extends RowPresenter {
     @ScheduleRowAction
     protected int[] getAvailableActions(ScheduleRow row) {
         if (row.getSchedule() != null) {
-            if (row.isRecordingInProgress()) {
-                return new int[]{ACTION_STOP_RECORDING};
-            } else if (row.isOnAir()) {
-                if (row.isRecordingNotStarted()) {
+            if (row.isOnAir()) {
+                if (row.isRecordingInProgress()) {
+                    return new int[] {ACTION_STOP_RECORDING};
+                } else if (row.isRecordingNotStarted()) {
                     if (canResolveConflict()) {
                         // The "START" action can change the conflict states.
                         return new int[] {ACTION_REMOVE_SCHEDULE, ACTION_START_RECORDING};