Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents 549eadf + 51d469b commit 9d34a4913fdeeec5aa677e75553ccd0651e3a2aa @samus samus committed Oct 19, 2013
@@ -14,17 +14,13 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
- <activity android:name="org.campjoy.identitree.starter.activities.SplashActivity" >
+ <activity android:name="org.campjoy.identitree.starter.MainActivity" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity
- android:name="org.campjoy.identitree.starter.MainActivity"
- android:label="@string/app_name" >
- </activity>
<activity android:name="org.campjoy.identitree.starter.activities.TreeInfoActivity" >
</activity>
<activity
@@ -0,0 +1,9 @@
+package org.campjoy.identitree.starter;
+
+import android.app.Activity;
+
+public class AboutActivity extends Activity {
+
+
+
+}
@@ -33,23 +33,23 @@ public void onClick(View v) {
});
-// final Intent about = new Intent(this, AboutActivity.class);
-// aboutImgView = (ImageView) findViewById(R.id.imageAbout);
-// aboutImgView.setOnClickListener(new View.OnClickListener() {
-// @Override
-// public void onClick(View v) {
-// startActivity(about);
-// }
-// });
-//
-// final Intent treeBrowser = new Intent(this, TreeInfoActivity.class);
-// treeBrowserImgView = (ImageView) findViewById(R.id.imageTreeBrowser);
-// treeBrowserImgView.setOnClickListener(new View.OnClickListener() {
-// @Override
-// public void onClick(View v) {
-// startActivity(treeBrowser);
-// }
-// });
+ final Intent about = new Intent(this, AboutActivity.class);
+ aboutImgView = (ImageView) findViewById(R.id.imageAbout);
+ aboutImgView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(about);
+ }
+ });
+
+ final Intent treeBrowser = new Intent(this, TreeInfoActivity.class);
+ treeBrowserImgView = (ImageView) findViewById(R.id.imageTreeBrowser);
+ treeBrowserImgView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(treeBrowser);
+ }
+ });
}
Oops, something went wrong.

0 comments on commit 9d34a49

Please sign in to comment.