Merge "Use TvView.setZOrderOnTop for PIP" into lmp-dev

2 files changed, 15 insertions, 16 deletions

diff --git a/src/com/android/tv/TvActivity.java b/src/com/android/tv/TvActivity.java
index e5127afc..18e78db6 100644
--- a/src/com/android/tv/TvActivity.java
+++ b/src/com/android/tv/TvActivity.java
@@ -259,16 +259,28 @@ public class TvActivity extends Activity implements AudioManager.OnAudioFocusCha
                 new Runnable() {
                     @Override
                     public void run() {
-                        if (mPipEnabled && mActivityResumed) {
+                        if (mPipEnabled && mActivityResumed
+                                && getFragmentManager().getBackStackEntryCount() <= 0) {
                             mPipView.setVisibility(View.VISIBLE);
                         }
                     }
                 });
-        mHideSideFragment = new HideRunnable(mSidePanelContainer, DURATION_SHOW_SIDE_FRAGMENT, null,
+        mHideSideFragment = new HideRunnable(mSidePanelContainer, DURATION_SHOW_SIDE_FRAGMENT,
+                new Runnable() {
+                    @Override
+                    public void run() {
+                        if (mPipEnabled) {
+                            mPipView.setVisibility(View.GONE);
+                        }
+                    }
+                },
                 new Runnable() {
                     @Override
                     public void run() {
                         resetSideFragment();
+                        if (mPipEnabled && mActivityResumed && !mMainMenuView.isShown()) {
+                            mPipView.setVisibility(View.VISIBLE);
+                        }
                     }
                 });
 
diff --git a/src/com/android/tv/ui/TunableTvView.java b/src/com/android/tv/ui/TunableTvView.java
index 141a340c..3f5978c1 100644
--- a/src/com/android/tv/ui/TunableTvView.java
+++ b/src/com/android/tv/ui/TunableTvView.java
@@ -14,7 +14,6 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
-import android.view.SurfaceView;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
@@ -37,7 +36,6 @@ public class TunableTvView extends FrameLayout implements StreamInfo {
             "android.permission.RECEIVE_INPUT_EVENT";
 
     private final TvView mTvView;
-    private final SurfaceView mSurfaceView;
     private long mChannelId = Channel.INVALID_ID;
     private TvInputManagerHelper mInputManagerHelper;
     private boolean mStarted;
@@ -184,7 +182,6 @@ public class TunableTvView extends FrameLayout implements StreamInfo {
         inflate(getContext(), R.layout.tunable_tv_view, this);
 
         mTvView = (TvView) findViewById(R.id.tv_view);
-        mSurfaceView = findSurfaceView(mTvView);
     }
 
     public void start(TvInputManagerHelper tvInputManagerHelper) {
@@ -261,7 +258,7 @@ public class TunableTvView extends FrameLayout implements StreamInfo {
     }
 
     public void setPip(boolean isPip) {
-        mSurfaceView.setZOrderMediaOverlay(isPip);
+        mTvView.setZOrderOnTop(isPip);
     }
 
     public void setStreamVolume(float volume) {
@@ -384,16 +381,6 @@ public class TunableTvView extends FrameLayout implements StreamInfo {
         mTvView.setStreamVolume(mVolume);
     }
 
-    private SurfaceView findSurfaceView(ViewGroup view) {
-        for (int i = 0; i < view.getChildCount(); ++i) {
-            if (view.getChildAt(i) instanceof SurfaceView) {
-                SurfaceView surfaceView = (SurfaceView) mTvView.getChildAt(i);
-                return surfaceView;
-            }
-        }
-        throw new RuntimeException("TvView does not have SurfaceView.");
-    }
-
     private void hideBlock() {
         findViewById(R.id.block_reason_unknown).setVisibility(GONE);
         findViewById(R.id.block_reason_tune).setVisibility(GONE);