Fix a left scroll focus escape issue on the channel AND chapter display overlay.

Author: WizardOfYendor1

app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java

@@ -475,7 +475,7 @@ public void refreshFavorite(UUID channelId) {
         @Override
         public boolean onKey(View v, int keyCode, KeyEvent event) {
             if (event.getAction() == KeyEvent.ACTION_DOWN) {
-                if (!mGuideVisible)
+                if (!mGuideVisible && !mPopupPanelVisible)
                     leanbackOverlayFragment.setShouldShowOverlay(true);
                 else {
                     leanbackOverlayFragment.setShouldShowOverlay(false);
@@ -527,11 +527,6 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
                     }
                 }
 
-                if (mPopupPanelVisible && !mGuideVisible && keyCode == KeyEvent.KEYCODE_DPAD_LEFT && mPopupRowPresenter.getPosition() == 0) {
-                    mPopupRowsFragment.requireView().requestFocus();
-                    mPopupRowPresenter.setPosition(0);
-                    return true;
-                }
                 if (mGuideVisible) {
                     if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_BUTTON_B || keyCode == KeyEvent.KEYCODE_ESCAPE) {
                         // go back to normal

app/src/main/java/org/jellyfin/androidtv/ui/presentation/PositionableListRowPresenter.kt

@@ -1,5 +1,6 @@
 package org.jellyfin.androidtv.ui.presentation
 
+import android.view.KeyEvent
 import androidx.leanback.widget.RowPresenter
 import timber.log.Timber
 
@@ -22,6 +23,12 @@ class PositionableListRowPresenter : CustomListRowPresenter {
 		if (holder !is ViewHolder) return
 
 		viewHolder = holder
+		// Prevent focus from escaping the grid at the left boundary so the user
+		// stays inside the popup (channel changer / chapter selector).
+		holder.gridView?.setOnKeyInterceptListener { event ->
+			event.keyCode == KeyEvent.KEYCODE_DPAD_LEFT &&
+				(holder.gridView?.selectedPosition ?: -1) <= 0
+		}
 	}
 
 	var position: Int