diff options
| author | goblin911 <goblinliu@gmail.com> | 2013-08-25 21:16:45 +0800 |
|---|---|---|
| committer | goblin911 <goblinliu@gmail.com> | 2013-08-25 21:16:45 +0800 |
| commit | 2efdc2f20f0306791ced5ec78a1acddfaf086f42 (patch) | |
| tree | a85f2b32d6e6da9d7329ab975fea3bd79e1b94b6 /client/Socket-demo/MainActivity.java | |
| parent | e5599da7fdd344fdcb49e8d6780a1e2ad358ee2d (diff) | |
| parent | 263967cbb477983ae8680b431c1d93f102971c30 (diff) | |
Merge branch 'master' of https://github.com/Determinant/piztor
Conflicts:
client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class
client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class
client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class
client/Piztor/bin/classes/com/macaroon/piztor/R$id.class
client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class
client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class
client/Piztor/bin/classes/com/macaroon/piztor/R$string.class
client/Piztor/gen/com/macaroon/piztor/R.java
client/Piztor/res/values/strings.xml
client/bin/classes/com/macaroon/piztor/ActStatus.class
client/bin/classes/com/macaroon/piztor/EmptyStatus.class
client/bin/classes/com/macaroon/piztor/Setting.class
client/src/com/macaroon/piztor/AppMgr.java
client/src/com/macaroon/piztor/Setting.java
Diffstat (limited to 'client/Socket-demo/MainActivity.java')
| -rw-r--r-- | client/Socket-demo/MainActivity.java | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/client/Socket-demo/MainActivity.java b/client/Socket-demo/MainActivity.java deleted file mode 100644 index ab2ef0c..0000000 --- a/client/Socket-demo/MainActivity.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.example.test; - -import android.app.Activity; -import android.os.Bundle; -import android.view.Menu; -import android.view.View; -import android.widget.TextView; - -public class MainActivity extends Activity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - TextView textview = (TextView)findViewById(R.id.textView1); - textview.setText("Server Created!"); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); - return true; - } - - - public void sendMessage(View view) { - - } - - - - - - - - -} - - - - - - |