aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/app/src
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2017-08-09 07:34:28 -0500
committerSamuel Holland <samuel@sholland.org>2017-08-09 07:34:28 -0500
commitd00480a3a5bbc179117d051180c6ee5316d34544 (patch)
treea521dcbd04c0fd500196ebcc9b2ad330955be0b0 /app/src
parentHook up editing to the layout and menus (diff)
downloadwireguard-android-d00480a3a5bbc179117d051180c6ee5316d34544.tar.xz
wireguard-android-d00480a3a5bbc179117d051180c6ee5316d34544.zip
Settings: Add empty activity
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/AndroidManifest.xml3
-rw-r--r--app/src/main/java/com/wireguard/android/ProfileActivity.java2
-rw-r--r--app/src/main/java/com/wireguard/android/SettingsActivity.java11
3 files changed, 15 insertions, 1 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 77dec36f..93973b78 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,6 +26,9 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+ <activity
+ android:name=".SettingsActivity"
+ android:label="@string/settings" />
<receiver android:name=".BootCompletedReceiver">
<intent-filter>
diff --git a/app/src/main/java/com/wireguard/android/ProfileActivity.java b/app/src/main/java/com/wireguard/android/ProfileActivity.java
index d23256d6..49502d07 100644
--- a/app/src/main/java/com/wireguard/android/ProfileActivity.java
+++ b/app/src/main/java/com/wireguard/android/ProfileActivity.java
@@ -57,7 +57,7 @@ abstract class ProfileActivity extends ServiceClientActivity<ProfileServiceInter
public abstract void onMenuSave(MenuItem item);
public void onMenuSettings(MenuItem item) {
-
+ startActivity(new Intent(this, SettingsActivity.class));
}
@Override
diff --git a/app/src/main/java/com/wireguard/android/SettingsActivity.java b/app/src/main/java/com/wireguard/android/SettingsActivity.java
new file mode 100644
index 00000000..c91a1bd2
--- /dev/null
+++ b/app/src/main/java/com/wireguard/android/SettingsActivity.java
@@ -0,0 +1,11 @@
+package com.wireguard.android;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class SettingsActivity extends Activity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ }
+}