Merge pull request #299 from LittleUncle/master

#3 #142 第三次实验
hzuapps · May 15, 2017 · 3d843b4 · 3d843b4
2 parents 3d089cc + 8fffe24
commit 3d843b4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/AndroidLabs/app/src/main/res/drawable/welcome.png b/AndroidLabs/app/src/main/res/drawable/welcome.png
diff --git a/AndroidLabs/app/src/main/res/layout/activity_net1414080903135_login.xml b/AndroidLabs/app/src/main/res/layout/activity_net1414080903135_login.xml
@@ -72,6 +72,21 @@
                 android:text="@string/action_sign_in"
                 android:textStyle="bold" />
 
+            <ImageView
+                android:layout_marginTop="20dp"
+                android:layout_width="match_parent"
+                android:layout_height="128dp"
+                android:src="@drawable/welcome"/>
+
+            <TextView
+                android:textSize="20sp"
+                android:layout_margin="20dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:text="welcome login"/>
+
+
         </LinearLayout>
     </ScrollView>
 </LinearLayout>