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, 35 insertions, 4 deletions

diff --git a/src/com/android/tv/data/BaseProgram.java b/src/com/android/tv/data/BaseProgram.java
index f420de02..4e36c80a 100644
--- a/src/com/android/tv/data/BaseProgram.java
+++ b/src/com/android/tv/data/BaseProgram.java
@@ -17,12 +17,17 @@
 package com.android.tv.data;
 
 import android.content.Context;
+import android.media.tv.TvContentRating;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+
+import com.android.tv.R;
 
 import java.util.Comparator;
 
 /**
  * Base class for {@link com.android.tv.data.Program} and
- * {@link com.android.tv.dvr.RecordedProgram}.
+ * {@link com.android.tv.dvr.data.RecordedProgram}.
  */
 public abstract class BaseProgram {
     /**
@@ -94,14 +99,29 @@ public abstract class BaseProgram {
     abstract public String getTitle();
 
     /**
-     * Returns the program's title withe its season and episode number.
+     * Returns the episode title.
      */
-    abstract public String getTitleWithEpisodeNumber(Context context);
+    abstract public String getEpisodeTitle();
 
     /**
      * Returns the displayed title of the program episode.
      */
-    abstract public String getEpisodeDisplayTitle(Context context);
+    public String getEpisodeDisplayTitle(Context context) {
+        if (!TextUtils.isEmpty(getEpisodeNumber())) {
+            String episodeTitle = getEpisodeTitle() == null ? "" : getEpisodeTitle();
+            if (TextUtils.equals(getSeasonNumber(), "0")) {
+                // Do not show "S0: ".
+                return String.format(context.getResources().getString(
+                        R.string.display_episode_title_format_no_season_number),
+                        getEpisodeNumber(), episodeTitle);
+            } else {
+                return String.format(context.getResources().getString(
+                        R.string.display_episode_title_format),
+                        getSeasonNumber(), getEpisodeNumber(), episodeTitle);
+            }
+        }
+        return getEpisodeTitle();
+    }
 
     /**
      * Returns the description of the program.
@@ -158,6 +178,10 @@ public abstract class BaseProgram {
      */
     abstract public int[] getCanonicalGenreIds();
 
+    /** Returns the array of content ratings. */
+    @Nullable
+    abstract public TvContentRating[] getContentRatings();
+
     /**
      * Returns channel's ID of the program.
      */
@@ -169,6 +193,13 @@ public abstract class BaseProgram {
     abstract public boolean isValid();
 
     /**
+     * Checks whether the program is episodic or not.
+     */
+    public boolean isEpisodic() {
+        return getSeriesId() != null;
+    }
+
+    /**
      * Generates the series ID for the other inputs than the tuner TV input.
      */
     public static String generateSeriesId(String packageName, String title) {