MarqueeTextViewCompat: broken layout navigation fix?

Author: yuliskov

smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/widgets/marqueetextviewcompat/MarqueeTextViewCompat.java

@@ -94,7 +94,7 @@ public MarqueeTextViewCompat(Context context, @Nullable AttributeSet attrs, int
 
     private void init(@Nullable AttributeSet attrs) {
         if (Build.VERSION.SDK_INT <= 19) {
-            super.setHorizontallyScrolling(true); // Android 4: Broken grid layout fix
+            //super.setHorizontallyScrolling(true); // Android 4: Broken grid layout fix
             super.setEllipsize(TruncateAt.END);
             return;
         }
@@ -125,9 +125,7 @@ private void init(@Nullable AttributeSet attrs) {
         mTextView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
         mTextView.setEllipsize(TruncateAt.END);
 
-        if (getEllipsize() != null) {
-            mIsMarqueeEnabled = getEllipsize() == TruncateAt.MARQUEE;
-        }
+        mIsMarqueeEnabled = getEllipsize() == TruncateAt.MARQUEE;
         super.setEllipsize(TruncateAt.END); // Important: disable marquee on the container view
     }
 
@@ -335,10 +333,11 @@ public void setMarqueeRepeatLimit(int marqueeLimit) {
         // NOP
     }
 
-    @Override
-    public void setHorizontallyScrolling(boolean whether) {
-        // NOP
-    }
+    // Don't uncomment. Android 4: Broken grid layout fix
+    //@Override
+    //public void setHorizontallyScrolling(boolean whether) {
+    //    // NOP
+    //}
 
     public void setMarqueeSpeedFactor(float factor) {
         mSpeed = dpToPx(ORIGINAL_SPEED * factor, getContext());