mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-01-07 00:20:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into develop

Browse source
This commit is contained in:
Thomas 2022-07-30 18:55:11 +02:00
commit efe387088e
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/res/layout/fragment_slide_media.xml
View file

@ -9,7 +9,8 @@
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fillViewport="true"> android:fillViewport="true"
android:keepScreenOn="true">
<RelativeLayout <RelativeLayout
android:id="@+id/media_fragment_container" android:id="@+id/media_fragment_container"

2
app/src/main/res/values/strings.xml
View file

@ -829,7 +829,7 @@
<item>Taqbaylit</item> <item>Taqbaylit</item>
<item>Català</item> <item>Català</item>
<item>ślůnski</item> <item>ślůnski</item>
<item>Sarda</item> <item>Sardu</item>
</string-array> </string-array>
<string-array name="SET_LED_COLOUR_VALUES" translatable="false"> <string-array name="SET_LED_COLOUR_VALUES" translatable="false">