Merge branch 'dev' into release

2 years ago · c2b6dd0d2f
parent c7a8a4b7ba 58981780ae
commit c2b6dd0d2f
2 changed files with 1 additions and 2 deletions
--- a/app/src/leanback/res/layout/dialog_live.xml
+++ b/app/src/leanback/res/layout/dialog_live.xml
@ -6,6 +6,6 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:padding="16dp"
-    app:maxHeight="264dp"
+    app:maxHeight="296dp"
    tools:itemCount="5"
    tools:listitem="@layout/adapter_live" />
--- a/app/src/mobile/res/layout/fragment_setting_custom.xml
+++ b/app/src/mobile/res/layout/fragment_setting_custom.xml
@ -48,7 +48,6 @@
                android:id="@+id/size"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
                android:background="@drawable/shape_item"
                android:orientation="horizontal">