[Android] Fix scroll issue on track selection
Nicolas Pomepuy
git at videolan.org
Fri Jul 3 08:27:19 CEST 2020
vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Jul 2 13:25:04 2020 +0200| [e7c8d01a16c008df5ddcd3d4291713ad4253fc52] | committer: Nicolas Pomepuy
Fix scroll issue on track selection
> https://code.videolan.org/videolan/vlc-android/commit/e7c8d01a16c008df5ddcd3d4291713ad4253fc52
---
.../res/layout/player_overlay_tracks.xml | 119 +++++++++++----------
1 file changed, 62 insertions(+), 57 deletions(-)
diff --git a/application/vlc-android/res/layout/player_overlay_tracks.xml b/application/vlc-android/res/layout/player_overlay_tracks.xml
index fb551a92b..026544f63 100644
--- a/application/vlc-android/res/layout/player_overlay_tracks.xml
+++ b/application/vlc-android/res/layout/player_overlay_tracks.xml
@@ -31,68 +31,73 @@
</data>
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/player_overlay_tracks"
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
+ android:layout_height="wrap_content">
-
- <include
- android:id="@+id/audio_tracks"
- layout="@layout/player_overlay_track_item"
- android:layout_width="0dp"
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/player_overlay_tracks"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:layout_constraintBottom_toTopOf="@+id/tracks_separator_2"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ android:orientation="horizontal">
- <View
- android:id="@+id/tracks_separator_2"
- android:layout_width="0dp"
- android:layout_height="1dp"
- android:background="@color/white_transparent_10"
- android:focusable="false"
- app:layout_constraintBottom_toTopOf="@+id/subtitle_tracks"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/audio_tracks" />
- <include
- android:id="@+id/subtitle_tracks"
- layout="@layout/player_overlay_track_item"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- app:layout_constraintBottom_toTopOf="@+id/tracks_separator_3"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/tracks_separator_2" />
+ <include
+ android:id="@+id/audio_tracks"
+ layout="@layout/player_overlay_track_item"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ app:layout_constraintBottom_toTopOf="@+id/tracks_separator_2"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
- <View
- android:id="@+id/tracks_separator_3"
- android:layout_width="0dp"
- android:layout_height="1dp"
- android:background="@color/white_transparent_10"
- android:focusable="false"
- app:layout_constraintBottom_toTopOf="@+id/video_tracks"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/subtitle_tracks" />
+ <View
+ android:id="@+id/tracks_separator_2"
+ android:layout_width="0dp"
+ android:layout_height="1dp"
+ android:background="@color/white_transparent_10"
+ android:focusable="false"
+ app:layout_constraintBottom_toTopOf="@+id/subtitle_tracks"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/audio_tracks" />
- <include
- android:id="@+id/video_tracks"
- layout="@layout/player_overlay_track_item"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/tracks_separator_3" />
- </androidx.constraintlayout.widget.ConstraintLayout>
+ <include
+ android:id="@+id/subtitle_tracks"
+ layout="@layout/player_overlay_track_item"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ app:layout_constraintBottom_toTopOf="@+id/tracks_separator_3"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/tracks_separator_2" />
+
+ <View
+ android:id="@+id/tracks_separator_3"
+ android:layout_width="0dp"
+ android:layout_height="1dp"
+ android:background="@color/white_transparent_10"
+ android:focusable="false"
+ app:layout_constraintBottom_toTopOf="@+id/video_tracks"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/subtitle_tracks" />
+
+ <include
+ android:id="@+id/video_tracks"
+ layout="@layout/player_overlay_track_item"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/tracks_separator_3" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.core.widget.NestedScrollView>
</layout>
\ No newline at end of file
More information about the Android
mailing list