Merge pull request #441 from hh-froal/master

#89 #153 lab3.
hzuapps · Apr 27, 2016 · a7f5a02 · a7f5a02
2 parents 86ad73a + 56129ee
commit a7f5a02
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/app/src/main/res/drawable/hh.png b/app/src/main/res/drawable/hh.png
diff --git a/app/src/main/res/layout/Com1314080901112activity.xml b/app/src/main/res/layout/Com1314080901112activity.xml
@@ -0,0 +1,18 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity">
+
+    <TextView android:text="@string/hello_world" android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="" />
+    <ImageView
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:src="@drawable/hh"/>
+
+</RelativeLayout>