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, 49 insertions, 23 deletions

diff --git a/src/com/android/tv/dvr/ui/list/DvrSeriesSchedulesFragment.java b/src/com/android/tv/dvr/ui/list/DvrSeriesSchedulesFragment.java
index 42a1e72b..57e7a88f 100644
--- a/src/com/android/tv/dvr/ui/list/DvrSeriesSchedulesFragment.java
+++ b/src/com/android/tv/dvr/ui/list/DvrSeriesSchedulesFragment.java
@@ -17,6 +17,7 @@
 package com.android.tv.dvr.ui.list;
 
 import android.annotation.TargetApi;
+import android.content.Context;
 import android.database.ContentObserver;
 import android.media.tv.TvContract.Programs;
 import android.net.Uri;
@@ -35,11 +36,13 @@ import com.android.tv.R;
 import com.android.tv.TvApplication;
 import com.android.tv.data.ChannelDataManager;
 import com.android.tv.data.Program;
+import com.android.tv.dvr.DvrDataManager;
 import com.android.tv.dvr.DvrDataManager.SeriesRecordingListener;
-import com.android.tv.dvr.EpisodicProgramLoadTask;
-import com.android.tv.dvr.SeriesRecording;
-import com.android.tv.dvr.ui.list.SchedulesHeaderRowPresenter.SeriesRecordingHeaderRowPresenter;
+import com.android.tv.dvr.data.SeriesRecording;
+import com.android.tv.dvr.provider.EpisodicProgramLoadTask;
+import com.android.tv.dvr.ui.BigArguments;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -47,20 +50,22 @@ import java.util.List;
  */
 @TargetApi(Build.VERSION_CODES.N)
 public class DvrSeriesSchedulesFragment extends BaseDvrSchedulesFragment {
-    private static final String TAG = "DvrSeriesSchedulesFragment";
     /**
      * The key for series recording whose scheduled recording list will be displayed.
+     * Type: {@link SeriesRecording}
      */
     public static final String SERIES_SCHEDULES_KEY_SERIES_RECORDING =
             "series_schedules_key_series_recording";
     /**
-     * The key for programs belong to the series recording whose scheduled recording
-     * list will be displayed.
+     * The key for programs which belong to the series recording whose scheduled recording list
+     * will be displayed.
+     * Type: List<{@link Program}>
      */
     public static final String SERIES_SCHEDULES_KEY_SERIES_PROGRAMS =
             "series_schedules_key_series_programs";
 
     private ChannelDataManager mChannelDataManager;
+    private DvrDataManager mDvrDataManager;
     private SeriesRecording mSeriesRecording;
     private List<Program> mPrograms;
     private EpisodicProgramLoadTask mProgramLoadTask;
@@ -87,20 +92,22 @@ public class DvrSeriesSchedulesFragment extends BaseDvrSchedulesFragment {
                                 && getRowsAdapter() instanceof SeriesScheduleRowAdapter) {
                             ((SeriesScheduleRowAdapter) getRowsAdapter())
                                     .onSeriesRecordingUpdated(r);
+                            mSeriesRecording = r;
+                            updateEmptyMessage();
                             return;
                         }
                     }
                 }
             };
 
-    private final ContentObserver mContentObserver =
-            new ContentObserver(new Handler(Looper.getMainLooper())) {
-                @Override
-                public void onChange(boolean selfChange, Uri uri) {
-                    super.onChange(selfChange, uri);
-                    executeProgramLoadingTask();
-                }
-            };
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+    private final ContentObserver mContentObserver = new ContentObserver(mHandler) {
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            super.onChange(selfChange, uri);
+            executeProgramLoadingTask();
+        }
+    };
 
     private final ChannelDataManager.Listener mChannelListener = new ChannelDataManager.Listener() {
         @Override
@@ -120,17 +127,28 @@ public class DvrSeriesSchedulesFragment extends BaseDvrSchedulesFragment {
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onAttach(Context context) {
+        super.onAttach(context);
         Bundle args = getArguments();
         if (args != null) {
             mSeriesRecording = args.getParcelable(SERIES_SCHEDULES_KEY_SERIES_RECORDING);
-            mPrograms = args.getParcelableArrayList(SERIES_SCHEDULES_KEY_SERIES_PROGRAMS);
+            mPrograms = (List<Program>) BigArguments.getArgument(
+                    SERIES_SCHEDULES_KEY_SERIES_PROGRAMS);
+            BigArguments.reset();
         }
+        if (args == null || mPrograms == null) {
+            getActivity().finish();
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ApplicationSingletons singletons = TvApplication.getSingletons(getContext());
-        singletons.getDvrDataManager().addSeriesRecordingListener(mSeriesRecordingListener);
         mChannelDataManager = singletons.getChannelDataManager();
         mChannelDataManager.addListener(mChannelListener);
+        mDvrDataManager = singletons.getDvrDataManager();
+        mDvrDataManager.addSeriesRecordingListener(mSeriesRecordingListener);
         getContext().getContentResolver().registerContentObserver(Programs.CONTENT_URI, true,
                 mContentObserver);
     }
@@ -144,8 +162,16 @@ public class DvrSeriesSchedulesFragment extends BaseDvrSchedulesFragment {
 
     private void onProgramsUpdated() {
         ((SeriesScheduleRowAdapter) getRowsAdapter()).setPrograms(mPrograms);
+        updateEmptyMessage();
+    }
+
+    private void updateEmptyMessage() {
         if (mPrograms == null || mPrograms.isEmpty()) {
-            showEmptyMessage(R.string.dvr_series_schedules_empty_state);
+            if (mSeriesRecording.getState() == SeriesRecording.STATE_SERIES_STOPPED) {
+                showEmptyMessage(R.string.dvr_series_schedules_stopped_empty_state);
+            } else {
+                showEmptyMessage(R.string.dvr_series_schedules_empty_state);
+            }
         } else {
             hideEmptyMessage();
         }
@@ -158,15 +184,15 @@ public class DvrSeriesSchedulesFragment extends BaseDvrSchedulesFragment {
             mProgramLoadTask = null;
         }
         getContext().getContentResolver().unregisterContentObserver(mContentObserver);
+        mHandler.removeCallbacksAndMessages(null);
         mChannelDataManager.removeListener(mChannelListener);
-        TvApplication.getSingletons(getContext()).getDvrDataManager()
-                .removeSeriesRecordingListener(mSeriesRecordingListener);
+        mDvrDataManager.removeSeriesRecordingListener(mSeriesRecordingListener);
         super.onDestroy();
     }
 
     @Override
     public SchedulesHeaderRowPresenter onCreateHeaderRowPresenter() {
-        return new SeriesRecordingHeaderRowPresenter(getContext());
+        return new SchedulesHeaderRowPresenter.SeriesRecordingHeaderRowPresenter(getContext());
     }
 
     @Override
@@ -195,7 +221,7 @@ public class DvrSeriesSchedulesFragment extends BaseDvrSchedulesFragment {
         mProgramLoadTask = new EpisodicProgramLoadTask(getContext(), mSeriesRecording) {
             @Override
             protected void onPostExecute(List<Program> programs) {
-                mPrograms = programs;
+                mPrograms = programs == null ? Collections.EMPTY_LIST : programs;
                 onProgramsUpdated();
             }
         };
@@ -205,4 +231,4 @@ public class DvrSeriesSchedulesFragment extends BaseDvrSchedulesFragment {
                 .setIgnoreChannelOption(true)
                 .execute();
     }
-}
\ No newline at end of file
+}