Changed name.

This commit is contained in:
Lars Jansøn Engvik committed 2011-12-05 15:37:46 +01:00
1 parent 476cfa4927
commit fbe978e343
2 files changed
+6 -3

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Det Norske Studentersamfund</string>
<string name="app_name">Studentersamfundet</string>
<string name="program_button">PROGRAM</string>
<string name="bli_med_button">BLI MED</string>
<string name="event_link_button">Gå til nettsiden</string>
@@ -4,6 +4,7 @@ import com.studentersamfundet.app.R;
import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
import android.os.Handler;
import android.view.View;
@@ -23,11 +24,13 @@ public abstract class BaseDnsActivity extends Activity {
/* Join button was pushed: */
} else if (v.getId() == R.id.bli_med_button) {
intent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY
/*intent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY
| Intent.FLAG_ACTIVITY_SINGLE_TOP);
intent.setClass(this, JoinUsActivity.class);
startActivity(intent);
startActivity(intent);*/
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://studentersamfundet.no/bliaktiv.php"));
startActivity(browserIntent);
/* The header was pushed: */
} else if (v.getId() == R.id.header) {