Merge remote-tracking branch 'origin/master'

2d07da59 · zhang_z · bc814fa7 · 8284dcae · 2d07da59 · bc814fa7
Commit 2d07da59 authored Mar 14, 2018 by zhang_z
Showing with 1 addition and 1 deletion

app/src/main/res/layout/fragment_service.xml app/src/main/res/layout/fragment_service.xml +1 -1

app/src/main/res/mipmap-xhdpi/bg_service.jpg app/src/main/res/mipmap-xhdpi/bg_service.jpg +0 -0

No files found.
--- a/app/src/main/res/layout/fragment_service.xml
+++ b/app/src/main/res/layout/fragment_service.xml
@@ -42,7 +42,7 @@

            <ImageView
                android:layout_width="match_parent"
-                android:layout_height="200dp"
+                android:layout_height="wrap_content"
                android:background="@mipmap/bg_service" />
        </ScrollView>


--- a/app/src/main/res/mipmap-xhdpi/bg_service.jpg
+++ b/app/src/main/res/mipmap-xhdpi/bg_service.jpg