Snap for 4378450 from 6ebde20b03db4c0d57f67acaac11832b610b966b to oc-mr1-releaseandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-release

Change-Id: I07f19344c030a9c2b0fd7ba425f7bf7462575f92

1 files changed, 80 insertions, 21 deletions

diff --git a/src/com/android/tv/dvr/ui/DvrInsufficientSpaceErrorFragment.java b/src/com/android/tv/dvr/ui/DvrInsufficientSpaceErrorFragment.java
index 3b1dbfa0..182416b6 100644
--- a/src/com/android/tv/dvr/ui/DvrInsufficientSpaceErrorFragment.java
+++ b/src/com/android/tv/dvr/ui/DvrInsufficientSpaceErrorFragment.java
@@ -17,6 +17,7 @@
 package com.android.tv.dvr.ui;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v17.leanback.widget.GuidanceStylist.Guidance;
@@ -24,19 +25,67 @@ import android.support.v17.leanback.widget.GuidedAction;
 
 import com.android.tv.R;
 import com.android.tv.TvApplication;
-import com.android.tv.dvr.DvrDataManager;
+import com.android.tv.common.SoftPreconditions;
+import com.android.tv.dvr.ui.browse.DvrBrowseActivity;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class DvrInsufficientSpaceErrorFragment extends DvrGuidedStepFragment {
-    private static final int ACTION_DONE = 1;
-    private static final int ACTION_OPEN_DVR = 2;
+    /**
+     * Key for the failed scheduled recordings information.
+     */
+    public static final String FAILED_SCHEDULED_RECORDING_INFOS =
+            "failed_scheduled_recording_infos";
+
+    private static final String TAG = "DvrInsufficientSpaceErrorFragment";
+
+    private static final int ACTION_VIEW_RECENT_RECORDINGS = 1;
+
+    private ArrayList<String> mFailedScheduledRecordingInfos;
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        Bundle args = getArguments();
+        if (args != null) {
+            mFailedScheduledRecordingInfos =
+                    args.getStringArrayList(FAILED_SCHEDULED_RECORDING_INFOS);
+        }
+        SoftPreconditions.checkState(
+                mFailedScheduledRecordingInfos != null && !mFailedScheduledRecordingInfos.isEmpty(),
+                TAG, "failed scheduled recording is null");
+    }
 
     @Override
     public Guidance onCreateGuidance(Bundle savedInstanceState) {
-        String title = getResources().getString(R.string.dvr_error_insufficient_space_title);
-        String description = getResources()
-                .getString(R.string.dvr_error_insufficient_space_description);
+        String title;
+        String description;
+        int failedScheduledRecordingSize = mFailedScheduledRecordingInfos.size();
+        if (failedScheduledRecordingSize == 1) {
+            title =  getString(
+                    R.string.dvr_error_insufficient_space_title_one_recording,
+                    mFailedScheduledRecordingInfos.get(0));
+            description = getString(
+                    R.string.dvr_error_insufficient_space_description_one_recording,
+                    mFailedScheduledRecordingInfos.get(0));
+        } else if (failedScheduledRecordingSize == 2) {
+            title =  getString(
+                    R.string.dvr_error_insufficient_space_title_two_recordings,
+                    mFailedScheduledRecordingInfos.get(0), mFailedScheduledRecordingInfos.get(1));
+            description = getString(
+                    R.string.dvr_error_insufficient_space_description_two_recordings,
+                    mFailedScheduledRecordingInfos.get(0), mFailedScheduledRecordingInfos.get(1));
+        } else {
+            title =  getString(
+                    R.string.dvr_error_insufficient_space_title_three_or_more_recordings,
+                    mFailedScheduledRecordingInfos.get(0), mFailedScheduledRecordingInfos.get(1),
+                    mFailedScheduledRecordingInfos.get(2));
+            description = getString(
+                    R.string.dvr_error_insufficient_space_description_three_or_more_recordings,
+                    mFailedScheduledRecordingInfos.get(0), mFailedScheduledRecordingInfos.get(1),
+                    mFailedScheduledRecordingInfos.get(2));
+        }
         return new Guidance(title, description, null, null);
     }
 
@@ -44,28 +93,38 @@ public class DvrInsufficientSpaceErrorFragment extends DvrGuidedStepFragment {
     public void onCreateActions(List<GuidedAction> actions, Bundle savedInstanceState) {
         Activity activity = getActivity();
         actions.add(new GuidedAction.Builder(activity)
-                .id(ACTION_DONE)
-                .title(getResources().getString(R.string.dvr_action_error_done))
+                .clickAction(GuidedAction.ACTION_ID_OK)
                 .build());
-        DvrDataManager dvrDataManager = TvApplication.getSingletons(getContext())
-                .getDvrDataManager();
-        if (!(dvrDataManager.getRecordedPrograms().isEmpty()
-                && dvrDataManager.getStartedRecordings().isEmpty()
-                && dvrDataManager.getNonStartedScheduledRecordings().isEmpty()
-                && dvrDataManager.getSeriesRecordings().isEmpty())) {
-                    actions.add(new GuidedAction.Builder(activity)
-                            .id(ACTION_OPEN_DVR)
-                            .title(getResources().getString(R.string.dvr_action_error_open_dvr))
-                            .build());
+        if (TvApplication.getSingletons(getContext()).getDvrManager().hasValidItems()) {
+            actions.add(new GuidedAction.Builder(activity)
+                    .id(ACTION_VIEW_RECENT_RECORDINGS)
+                    .title(getResources().getString(
+                            R.string.dvr_error_insufficient_space_action_view_recent_recordings))
+                    .build());
         }
     }
 
     @Override
-    public void onGuidedActionClicked(GuidedAction action) {
-        if (action.getId() == ACTION_OPEN_DVR) {
-            Intent intent = new Intent(getActivity(), DvrActivity.class);
+    public void onTrackedGuidedActionClicked(GuidedAction action) {
+        if (action.getId() == ACTION_VIEW_RECENT_RECORDINGS) {
+            Intent intent = new Intent(getActivity(), DvrBrowseActivity.class);
             getActivity().startActivity(intent);
         }
         dismissDialog();
     }
+
+    @Override
+    public String getTrackerPrefix() {
+        return "DvrInsufficientSpaceErrorFragment";
+    }
+
+    @Override
+    public String getTrackerLabelForGuidedAction(GuidedAction action) {
+        long actionId = action.getId();
+        if (actionId == ACTION_VIEW_RECENT_RECORDINGS) {
+            return "view-recent";
+        } else {
+            return super.getTrackerLabelForGuidedAction(action);
+        }
+    }
 }