projects
/
Sunshine.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated Gradle config for Android Studio 1.0
[Sunshine.git]
/
app
/
src
/
main
/
java
/
uk
/
me
/
njae
/
sunshine
/
MainActivity.java
diff --git
a/app/src/main/java/uk/me/njae/sunshine/MainActivity.java
b/app/src/main/java/uk/me/njae/sunshine/MainActivity.java
index ce0d65baf5a7529970de890641765536cc821458..de3aa06d61477ebd38d0e0e98b58b5968012220a 100644
(file)
--- a/
app/src/main/java/uk/me/njae/sunshine/MainActivity.java
+++ b/
app/src/main/java/uk/me/njae/sunshine/MainActivity.java
@@
-1,7
+1,8
@@
package uk.me.njae.sunshine;
package uk.me.njae.sunshine;
-import android.
support.v7.app.ActionBarActivity
;
+import android.
content.Intent
;
import android.os.Bundle;
import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
import android.view.Menu;
import android.view.MenuItem;
import android.view.Menu;
import android.view.MenuItem;
@@
-34,7
+35,7
@@
public class MainActivity extends ActionBarActivity {
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
if (id == R.id.action_settings) {
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
if (id == R.id.action_settings) {
-
return true
;
+
startActivity(new Intent(this, SettingsActivity.class))
;
}
return super.onOptionsItemSelected(item);
}
}
return super.onOptionsItemSelected(item);
}