From d30178f68f4468d8fc53b96e8e3abeb6a220f584 Mon Sep 17 00:00:00 2001 From: polymorphicshade Date: Thu, 14 May 2020 21:30:45 -0600 Subject: [PATCH] SponsorBlock: Made the FocusAwareSeekBar extend MarkableSeekBar SponsorBlock's sponsor times overlay and Android TV support were developed in parallel, this merges the changes of both. --- .../main/java/org/schabi/newpipe/views/FocusAwareSeekBar.java | 4 +--- app/src/main/res/layout-large-land/activity_main_player.xml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/views/FocusAwareSeekBar.java b/app/src/main/java/org/schabi/newpipe/views/FocusAwareSeekBar.java index 6dbcded48..4b8d1d08e 100644 --- a/app/src/main/java/org/schabi/newpipe/views/FocusAwareSeekBar.java +++ b/app/src/main/java/org/schabi/newpipe/views/FocusAwareSeekBar.java @@ -24,8 +24,6 @@ import android.view.KeyEvent; import android.view.ViewTreeObserver; import android.widget.SeekBar; -import androidx.appcompat.widget.AppCompatSeekBar; - import org.schabi.newpipe.util.AndroidTvUtils; /** @@ -33,7 +31,7 @@ import org.schabi.newpipe.util.AndroidTvUtils; * (onStartTrackingTouch/onStopTrackingTouch), so existing code does not need to be changed to * work with it. */ -public final class FocusAwareSeekBar extends AppCompatSeekBar { +public final class FocusAwareSeekBar extends MarkableSeekBar { private NestedListener listener; private ViewTreeObserver treeObserver; diff --git a/app/src/main/res/layout-large-land/activity_main_player.xml b/app/src/main/res/layout-large-land/activity_main_player.xml index a5d10d6fa..09376d006 100644 --- a/app/src/main/res/layout-large-land/activity_main_player.xml +++ b/app/src/main/res/layout-large-land/activity_main_player.xml @@ -455,7 +455,7 @@ tools:text="1:06:29"/> -