Merge pull request #205 from qingtian1993/master

#43 1314080901225_sy2
hzuapps · Apr 14, 2016 · cb89754 · cb89754
2 parents 74be2df + 9d529bf
commit cb89754
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/...meworks.com1314080901225/#43仿你画我猜画板功能.txt → ...meworks/com1314080901225/#43仿你画我猜画板功能.txt b/...meworks.com1314080901225/#43仿你画我猜画板功能.txt → ...meworks/com1314080901225/#43仿你画我猜画板功能.txt
diff --git a/...in/java/edu/hzuapps/androidworks/homeworks/com1314080901225/Com1314080901225Activity.java b/...in/java/edu/hzuapps/androidworks/homeworks/com1314080901225/Com1314080901225Activity.java
@@ -0,0 +1,22 @@
+package com.example.drawingboard;
+
+import android.os.Bundle;
+import android.app.Activity;
+import android.view.Menu;
+
+public class Com1314080901225Activity extends Activity {
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_com1314080901225);
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		// Inflate the menu; this adds items to the action bar if it is present.
+		getMenuInflater().inflate(R.menu.com1314080901225, menu);
+		return true;
+	}
+
+}