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, 78 insertions, 111 deletions

diff --git a/src/com/android/tv/ui/ChannelBannerView.java b/src/com/android/tv/ui/ChannelBannerView.java
index 3cf4de83..a5d897f2 100644
--- a/src/com/android/tv/ui/ChannelBannerView.java
+++ b/src/com/android/tv/ui/ChannelBannerView.java
@@ -23,12 +23,9 @@ import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.Resources;
-import android.database.ContentObserver;
 import android.graphics.Bitmap;
 import android.media.tv.TvContentRating;
-import android.media.tv.TvContract;
 import android.media.tv.TvInputInfo;
-import android.net.Uri;
 import android.os.Handler;
 import android.support.annotation.Nullable;
 import android.text.Spannable;
@@ -52,12 +49,13 @@ import android.widget.TextView;
 import com.android.tv.MainActivity;
 import com.android.tv.R;
 import com.android.tv.TvApplication;
+import com.android.tv.common.SoftPreconditions;
 import com.android.tv.common.feature.CommonFeatures;
 import com.android.tv.data.Channel;
 import com.android.tv.data.Program;
 import com.android.tv.data.StreamInfo;
 import com.android.tv.dvr.DvrManager;
-import com.android.tv.dvr.ScheduledRecording;
+import com.android.tv.dvr.data.ScheduledRecording;
 import com.android.tv.parental.ContentRatingsManager;
 import com.android.tv.util.ImageCache;
 import com.android.tv.util.ImageLoader;
@@ -65,10 +63,6 @@ import com.android.tv.util.ImageLoader.ImageLoaderCallback;
 import com.android.tv.util.ImageLoader.LoadTvInputLogoTask;
 import com.android.tv.util.Utils;
 
-import junit.framework.Assert;
-
-import java.util.Objects;
-
 /**
  * A view to render channel banner.
  */
@@ -98,8 +92,8 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
 
     private static final String EMPTY_STRING = "";
 
-    private static Program sNoProgram;
-    private static Program sLockedChannelProgram;
+    private Program mNoProgram;
+    private Program mLockedChannelProgram;
     private static String sClosedCaptionMark;
 
     private final MainActivity mMainActivity;
@@ -123,6 +117,7 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
     private String mProgramDescriptionText;
     private View mAnchorView;
     private Channel mCurrentChannel;
+    private boolean mCurrentChannelLogoExists;
     private Program mLastUpdatedProgram;
     private final Handler mHandler = new Handler();
     private final DvrManager mDvrManager;
@@ -130,6 +125,7 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
     private TvContentRating mBlockingContentRating;
 
     private int mLockType;
+    private boolean mUpdateOnTune;
 
     private Animator mResizeAnimator;
     private int mCurrentHeight;
@@ -178,24 +174,6 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
         }
     };
 
-    private final ContentObserver mProgramUpdateObserver = new ContentObserver(mHandler) {
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            // TODO: This {@code uri} argument may be a program which is not related to this
-            // channel. Consider adding channel id as a parameter of program URI to avoid
-            // unnecessary update.
-            mHandler.post(mProgramUpdateRunnable);
-        }
-    };
-
-    private final Runnable mProgramUpdateRunnable = new Runnable() {
-        @Override
-        public void run() {
-            removeCallbacks(this);
-            updateViews(null);
-        }
-    };
-
     public ChannelBannerView(Context context) {
         this(context, null);
     }
@@ -243,39 +221,20 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
         mContentRatingsManager = TvApplication.getSingletons(getContext())
                 .getTvInputManagerHelper().getContentRatingsManager();
 
-        if (sNoProgram == null) {
-            sNoProgram = new Program.Builder()
-                    .setTitle(context.getString(R.string.channel_banner_no_title))
-                    .setDescription(EMPTY_STRING)
-                    .build();
-        }
-        if (sLockedChannelProgram == null){
-            sLockedChannelProgram = new Program.Builder()
-                    .setTitle(context.getString(R.string.channel_banner_locked_channel_title))
-                    .setDescription(EMPTY_STRING)
-                    .build();
-        }
+        mNoProgram = new Program.Builder()
+                .setTitle(context.getString(R.string.channel_banner_no_title))
+                .setDescription(EMPTY_STRING)
+                .build();
+        mLockedChannelProgram = new Program.Builder()
+                .setTitle(context.getString(R.string.channel_banner_locked_channel_title))
+                .setDescription(EMPTY_STRING)
+                .build();
         if (sClosedCaptionMark == null) {
             sClosedCaptionMark = context.getString(R.string.closed_caption);
         }
     }
 
     @Override
-    protected void onAttachedToWindow() {
-        if (DEBUG) Log.d(TAG, "onAttachedToWindow");
-        super.onAttachedToWindow();
-        getContext().getContentResolver().registerContentObserver(TvContract.Programs.CONTENT_URI,
-                true, mProgramUpdateObserver);
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        if (DEBUG) Log.d(TAG, "onDetachedToWindow");
-        getContext().getContentResolver().unregisterContentObserver(mProgramUpdateObserver);
-        super.onDetachedFromWindow();
-    }
-
-    @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
 
@@ -345,19 +304,17 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
      * Set new lock type.
      *
      * @param lockType Any of LOCK_NONE, LOCK_PROGRAM_DETAIL, or LOCK_CHANNEL_INFO.
-     * @return {@code true} only if lock type is changed
+     * @return the previous lock type of the channel banner.
      * @throws IllegalArgumentException if lockType is invalid.
      */
-    public boolean setLockType(int lockType) {
+    public int setLockType(int lockType) {
         if (lockType != LOCK_NONE && lockType != LOCK_CHANNEL_INFO
                 && lockType != LOCK_PROGRAM_DETAIL) {
             throw new IllegalArgumentException("No such lock type " + lockType);
         }
-        if (mLockType != lockType) {
-            mLockType = lockType;
-            return true;
-        }
-        return false;
+        int previousLockType = mLockType;
+        mLockType = lockType;
+        return previousLockType;
     }
 
     /**
@@ -372,31 +329,34 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
     /**
      * Update channel banner view.
      *
-     * @param info A StreamInfo that includes stream information.
-     * If it's {@code null}, only program information will be updated.
+     * @param updateOnTune {@false} denotes the channel banner is updated due to other reasons than
+     *                              tuning. The channel info will not be updated in this case.
      */
-    public void updateViews(StreamInfo info) {
+    public void updateViews(boolean updateOnTune) {
         resetAnimationEffects();
-        Channel channel = mMainActivity.getCurrentChannel();
-        if (!Objects.equals(mCurrentChannel, channel)) {
-            mBlockingContentRating = null;
+        mChannelView.setVisibility(VISIBLE);
+        mUpdateOnTune = updateOnTune;
+        if (mUpdateOnTune) {
             if (isShown()) {
                 scheduleHide();
             }
-        }
-        mCurrentChannel = channel;
-        mChannelView.setVisibility(VISIBLE);
-        if (info != null) {
-            // If the current channels between ChannelTuner and TvView are different,
-            // the stream information should not be seen.
-            updateStreamInfo(channel != null && channel.equals(info.getCurrentChannel()) ? info
-                    : null);
+            mBlockingContentRating = null;
+            mCurrentChannel = mMainActivity.getCurrentChannel();
+            mCurrentChannelLogoExists =
+                    mCurrentChannel != null && mCurrentChannel.channelLogoExists();
+            updateStreamInfo(null);
             updateChannelInfo();
         }
         updateProgramInfo(mMainActivity.getCurrentProgram());
+        mUpdateOnTune = false;
     }
 
-    private void updateStreamInfo(StreamInfo info) {
+    /**
+     * Update channel banner view with stream info.
+     *
+     * @param info A StreamInfo that includes stream information.
+     */
+    public void updateStreamInfo(StreamInfo info) {
         // Update stream information in a channel.
         if (mLockType != LOCK_CHANNEL_INFO && info != null) {
             updateText(mClosedCaptionTextView, info.hasClosedCaption() ? sClosedCaptionMark
@@ -414,9 +374,6 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
             mAspectRatioTextView.setVisibility(View.GONE);
             mResolutionTextView.setVisibility(View.GONE);
             mAudioChannelTextView.setVisibility(View.GONE);
-            for (int i = 0; i < DISPLAYED_CONTENT_RATINGS_COUNT; i++) {
-                mContentRatingsTextViews[i].setVisibility(View.GONE);
-            }
         }
     }
 
@@ -467,7 +424,7 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
         }
         mChannelLogoImageView.setImageBitmap(null);
         mChannelLogoImageView.setVisibility(View.GONE);
-        if (mCurrentChannel != null) {
+        if (mCurrentChannel != null && mCurrentChannelLogoExists) {
             mCurrentChannel.loadBitmap(getContext(), Channel.LOAD_IMAGE_TYPE_CHANNEL_LOGO,
                     mChannelLogoImageViewWidth, mChannelLogoImageViewHeight,
                     createChannelLogoCallback(this, mCurrentChannel));
@@ -550,8 +507,9 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
 
         if (mResizeAnimator == null) {
             String description = mProgramDescriptionTextView.getText().toString();
-            boolean needFadeAnimation = !description.equals(mProgramDescriptionText);
-            updateBannerHeight(needFadeAnimation);
+            boolean programDescriptionNeedFadeAnimation =
+                    !description.equals(mProgramDescriptionText) && !mUpdateOnTune;
+            updateBannerHeight(programDescriptionNeedFadeAnimation);
         } else {
             mProgramInfoUpdatePendingByResizing = true;
         }
@@ -559,9 +517,9 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
 
     private void updateProgramInfo(Program program) {
         if (mLockType == LOCK_CHANNEL_INFO) {
-            program = sLockedChannelProgram;
+            program = mLockedChannelProgram;
         } else if (program == null || !program.isValid() || TextUtils.isEmpty(program.getTitle())) {
-            program = sNoProgram;
+            program = mNoProgram;
         }
 
         if (mLastUpdatedProgram == null
@@ -590,9 +548,9 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
                 mProgramDescriptionText = program.getDescription();
             }
             String description = mProgramDescriptionTextView.getText().toString();
-            boolean needFadeAnimation = isProgramChanged
-                    || !description.equals(mProgramDescriptionText);
-            updateBannerHeight(needFadeAnimation);
+            boolean programDescriptionNeedFadeAnimation = (isProgramChanged
+                    || !description.equals(mProgramDescriptionText)) && !mUpdateOnTune;
+            updateBannerHeight(programDescriptionNeedFadeAnimation);
         } else {
             mProgramInfoUpdatePendingByResizing = true;
         }
@@ -603,7 +561,7 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
         if (program == null) {
             return;
         }
-        updateProgramTextView(program == sLockedChannelProgram, program.getTitle(),
+        updateProgramTextView(program == mLockedChannelProgram, program.getTitle(),
                 program.getEpisodeDisplayTitle(getContext()));
     }
 
@@ -630,9 +588,8 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
                     Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
             mProgramTextView.setText(text);
         }
-        int width = mProgramDescriptionTextViewWidth
-                - ((mChannelLogoImageView.getVisibility() != View.VISIBLE)
-                ? 0 : mChannelLogoImageViewWidth + mChannelLogoImageViewMarginStart);
+        int width = mProgramDescriptionTextViewWidth + (mCurrentChannelLogoExists ?
+                0 : mChannelLogoImageViewWidth + mChannelLogoImageViewMarginStart);
         ViewGroup.LayoutParams lp = mProgramTextView.getLayoutParams();
         lp.width = width;
         mProgramTextView.setLayoutParams(lp);
@@ -655,23 +612,32 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
     }
 
     private void updateProgramRatings(Program program) {
-        if (mBlockingContentRating != null) {
-            mContentRatingsTextViews[0].setText(
-                    mContentRatingsManager.getDisplayNameForRating(mBlockingContentRating));
-            mContentRatingsTextViews[0].setVisibility(View.VISIBLE);
-            for (int i = 1; i < DISPLAYED_CONTENT_RATINGS_COUNT; i++) {
+        if (mLockType == LOCK_CHANNEL_INFO) {
+            for (int i = 0; i < DISPLAYED_CONTENT_RATINGS_COUNT; i++) {
                 mContentRatingsTextViews[i].setVisibility(View.GONE);
             }
-            return;
-        }
-        TvContentRating[] ratings = (program == null) ? null : program.getContentRatings();
-        for (int i = 0; i < DISPLAYED_CONTENT_RATINGS_COUNT; i++) {
-            if (ratings == null || ratings.length <= i) {
-                mContentRatingsTextViews[i].setVisibility(View.GONE);
+        } else if (mBlockingContentRating != null) {
+            String displayNameForRating =
+                    mContentRatingsManager.getDisplayNameForRating(mBlockingContentRating);
+            if (!TextUtils.isEmpty(displayNameForRating)) {
+                mContentRatingsTextViews[0].setText(displayNameForRating);
+                mContentRatingsTextViews[0].setVisibility(View.VISIBLE);
             } else {
-                mContentRatingsTextViews[i].setText(
-                        mContentRatingsManager.getDisplayNameForRating(ratings[i]));
-                mContentRatingsTextViews[i].setVisibility(View.VISIBLE);
+                mContentRatingsTextViews[0].setVisibility(View.GONE);
+            }
+            for (int i = 1; i < DISPLAYED_CONTENT_RATINGS_COUNT; i++) {
+                mContentRatingsTextViews[i].setVisibility(View.GONE);
+            }
+        } else {
+            TvContentRating[] ratings = (program == null) ? null : program.getContentRatings();
+            for (int i = 0; i < DISPLAYED_CONTENT_RATINGS_COUNT; i++) {
+                if (ratings == null || ratings.length <= i) {
+                    mContentRatingsTextViews[i].setVisibility(View.GONE);
+                } else {
+                    mContentRatingsTextViews[i].setText(
+                            mContentRatingsManager.getDisplayNameForRating(ratings[i]));
+                    mContentRatingsTextViews[i].setVisibility(View.VISIBLE);
+                }
             }
         }
     }
@@ -769,8 +735,8 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
         mLastUpdatedProgram = program;
     }
 
-    private void updateBannerHeight(boolean needFadeAnimation) {
-        Assert.assertNull(mResizeAnimator);
+    private void updateBannerHeight(boolean needProgramDescriptionFadeAnimation) {
+        SoftPreconditions.checkState(mResizeAnimator == null);
         // Need to measure the layout height with the new description text.
         CharSequence oldDescription = mProgramDescriptionTextView.getText();
         mProgramDescriptionTextView.setText(mProgramDescriptionText);
@@ -785,12 +751,13 @@ public class ChannelBannerView extends FrameLayout implements TvTransitionManage
                 layoutParams.height = targetHeight;
                 setLayoutParams(layoutParams);
             }
-        } else if (mCurrentHeight != targetHeight || needFadeAnimation) {
+        } else if (mCurrentHeight != targetHeight || needProgramDescriptionFadeAnimation) {
             // Restore description text for fade in/out animation.
-            if (needFadeAnimation) {
+            if (needProgramDescriptionFadeAnimation) {
                 mProgramDescriptionTextView.setText(oldDescription);
             }
-            mResizeAnimator = createResizeAnimator(targetHeight, needFadeAnimation);
+            mResizeAnimator =
+                    createResizeAnimator(targetHeight, needProgramDescriptionFadeAnimation);
             mResizeAnimator.start();
         }
     }