Merge pull request hzuapps#417 from isshe/master

hzuapps#89 hzuapps#90 hzuapps#12 实验3、4相同截图相同代码
zhuoxw · Apr 27, 2016 · fefd06c · fefd06c
2 parents 133a7ac + 9bfee3e
commit fefd06c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/app/src/main/res/drawable/pho.jpg → ...in/res/drawable/Net1314080903212photo.jpg b/app/src/main/res/drawable/pho.jpg → ...in/res/drawable/Net1314080903212photo.jpg
diff --git a/app/src/main/res/layout/main.xml → ...main/res/layout/Net1314080903212_main.xml b/app/src/main/res/layout/main.xml → ...main/res/layout/Net1314080903212_main.xml
@@ -33,7 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="top"
-        android:background="@drawable/pho"
+        android:background="@drawable/Net1314080903212photo"
         android:textSize="14dp"
         android:textColor="#000"
         android:maxLines="30"