player: disable ui focus recovery

Author: yuliskov

smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/mod/leanback/playerglue/tweaks/ControlBar.java

@@ -34,10 +34,10 @@ public interface OnChildFocusedListener {
     // Can't set to static. Because we have two control bars.
     private int mLastFocusIndex = -1;
     // MOD: Sync focus index between rows
-    private static int sSyncedFocusIndex = -1;
+    private static int sSharedFocusIndex = -1;
+    private boolean mIsSharedFocusEnabled = true;
     private boolean mDefaultFocusToMiddle = true;
     private boolean mFocusRecovery = true;
-    private boolean mIsSyncedFocusIndexEnabled = true;
 
     public ControlBar(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -63,8 +63,8 @@ void setFocusRecovery(boolean focusRecovery) {
     /**
      * MOD: synced navigation between rows
      */
-    void setSyncedFocusIndexEnabled(boolean enabled) {
-        mIsSyncedFocusIndexEnabled = enabled;
+    void setSharedFocusEnabled(boolean enabled) {
+        mIsSharedFocusEnabled = enabled;
     }
 
     void resetFocus() {
@@ -150,10 +150,10 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     private void setFocusIndex(int index) {
         mLastFocusIndex = index;
         if (index != -1) // don't reset global focus between player launches
-            sSyncedFocusIndex = index;
+            sSharedFocusIndex = index;
     }
 
     private int getFocusIndex() {
-        return mIsSyncedFocusIndexEnabled ? sSyncedFocusIndex : mLastFocusIndex;
+        return mIsSharedFocusEnabled ? sSharedFocusIndex : mLastFocusIndex;
     }
 }

smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/mod/leanback/playerglue/tweaks/ControlBarPresenter.java

@@ -97,7 +97,7 @@ class ViewHolder extends Presenter.ViewHolder {
             }
             mControlBar.setDefaultFocusToMiddle(mDefaultFocusToMiddle);
             mControlBar.setFocusRecovery(mFocusRecovery);
-            mControlBar.setSyncedFocusIndexEnabled(mIsSyncedFocusIndexEnabled);
+            mControlBar.setSharedFocusEnabled(mIsSharedFocusEnabled);
             mControlBar.setOnChildFocusedListener(new ControlBar.OnChildFocusedListener() {
                 @Override
                 public void onChildFocusedListener(View child, View focused) {
@@ -221,7 +221,7 @@ ObjectAdapter getDisplayedAdapter() {
     private static int sControlIconWidth;
     boolean mDefaultFocusToMiddle = true;
     boolean mFocusRecovery = true;
-    boolean mIsSyncedFocusIndexEnabled = true;
+    boolean mIsSharedFocusEnabled = true;
 
     /**
      * Constructor for a ControlBarPresenter.
@@ -343,7 +343,7 @@ void setFocusRecovery(boolean focusRecovery) {
     /**
      * MOD: global navigation
      */
-    void setSyncedFocusIndexEnabled(boolean enabled) {
-        mIsSyncedFocusIndexEnabled = enabled;
+    void setSharedFocusEnabled(boolean enabled) {
+        mIsSharedFocusEnabled = enabled;
     }
 }

smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/mod/leanback/playerglue/tweaks/PlaybackTransportRowPresenter.java

@@ -429,8 +429,8 @@ public ViewHolder(View rootView, Presenter descriptionPresenter) {
             mPlayerData = PlayerData.instance(rootView.getContext());
             // MOD: switch between navigation modes
             PlayerTweaksData tweaksData = PlayerTweaksData.instance(rootView.getContext());
-            PlaybackTransportRowPresenter.this.mPlaybackControlsPresenter.setSyncedFocusIndexEnabled(tweaksData.isSyncRowButtonIndexEnabled());
-            PlaybackTransportRowPresenter.this.mSecondaryControlsPresenter.setSyncedFocusIndexEnabled(tweaksData.isSyncRowButtonIndexEnabled());
+            PlaybackTransportRowPresenter.this.mPlaybackControlsPresenter.setSharedFocusEnabled(tweaksData.isSyncRowButtonIndexEnabled());
+            PlaybackTransportRowPresenter.this.mSecondaryControlsPresenter.setSharedFocusEnabled(tweaksData.isSyncRowButtonIndexEnabled());
             mImageView = (ImageView) rootView.findViewById(R.id.image);
             mDescriptionDock = (ViewGroup) rootView.findViewById(R.id.description_dock);
             mCurrentTime = (TextView) rootView.findViewById(R.id.current_time);
@@ -920,10 +920,10 @@ public PlaybackTransportRowPresenter() {
 
         mPlaybackControlsPresenter = new ControlBarPresenter(com.liskovsoft.smartyoutubetv2.tv.R.layout.lb_control_bar);
         mPlaybackControlsPresenter.setDefaultFocusToMiddle(false);
-        mPlaybackControlsPresenter.setFocusRecovery(true);
+        mPlaybackControlsPresenter.setFocusRecovery(false);
         mSecondaryControlsPresenter = new ControlBarPresenter(com.liskovsoft.smartyoutubetv2.tv.R.layout.lb_control_bar);
         mSecondaryControlsPresenter.setDefaultFocusToMiddle(false);
-        mSecondaryControlsPresenter.setFocusRecovery(true);
+        mSecondaryControlsPresenter.setFocusRecovery(false);
 
         mPlaybackControlsPresenter.setOnControlSelectedListener(mOnControlSelectedListener);
         mSecondaryControlsPresenter.setOnControlSelectedListener(mOnControlSelectedListener);