Merge remote-tracking branch 'origin/master'

This commit is contained in:
Hosted Weblate 2024-04-10 17:16:09 +02:00
commit 2fad760426
No known key found for this signature in database
GPG key ID: A3FAAA06E6569B4C

View file

@ -38,12 +38,11 @@
android:requiresFadingEdge="vertical" android:requiresFadingEdge="vertical"
android:id="@+id/video_tracks_list" android:id="@+id/video_tracks_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_rowWeight="1" android:layout_rowWeight="1"
android:background="?attr/primaryBlackBackground" android:background="?attr/primaryBlackBackground"
android:nextFocusLeft="@id/sort_subtitles" android:nextFocusRight="@id/audio_tracks_holder"
android:nextFocusRight="@id/apply_btt"
tools:listitem="@layout/sort_bottom_single_choice" /> tools:listitem="@layout/sort_bottom_single_choice" />
</LinearLayout> </LinearLayout>
@ -110,12 +109,11 @@
android:requiresFadingEdge="vertical" android:requiresFadingEdge="vertical"
android:id="@+id/auto_tracks_list" android:id="@+id/auto_tracks_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_rowWeight="1" android:layout_rowWeight="1"
android:background="?attr/primaryBlackBackground" android:background="?attr/primaryBlackBackground"
android:nextFocusLeft="@id/sort_providers" android:nextFocusRight="@id/apply_btt"
android:nextFocusRight="@id/cancel_btt" android:nextFocusLeft="@id/video_tracks_list"
tools:listfooter="@layout/sort_bottom_footer_add_choice" tools:listfooter="@layout/sort_bottom_footer_add_choice"
tools:listitem="@layout/sort_bottom_single_choice" /> tools:listitem="@layout/sort_bottom_single_choice" />
</LinearLayout> </LinearLayout>
@ -136,6 +134,7 @@
android:layout_gravity="center_vertical|end" android:layout_gravity="center_vertical|end"
android:text="@string/sort_apply" android:text="@string/sort_apply"
android:id="@+id/apply_btt" android:id="@+id/apply_btt"
android:nextFocusLeft="@id/auto_tracks_list"
android:layout_width="wrap_content" /> android:layout_width="wrap_content" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton