summaryrefslogtreecommitdiffhomepage
path: root/app/src/main
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2017-08-23 17:57:43 -0500
committerSamuel Holland <samuel@sholland.org>2017-08-23 17:57:43 -0500
commitb1c1889c5091e4a573e2c42244655508e0bb1588 (patch)
tree20e529f0b1f17eb4f293c1c149c564c68482b2c2 /app/src/main
parentc1cdea42b6261008596d6924dcc488aef289b0d2 (diff)
manifest: ConfigActivity is parent to AddActivity
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/AndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4dfad4fa..1563d312 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,8 @@
</activity>
<activity
android:name=".AddActivity"
- android:label="@string/add_activity_title" />
+ android:label="@string/add_activity_title"
+ android:parentActivityName=".ConfigActivity" />
<activity
android:name=".SettingsActivity"
android:label="@string/settings">