X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyCell.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2FAndroidManifest.xml;h=a510530d9d551cd8b545baa2ec77d5a1ea9274ec;hp=ab618bbf089a6952ca61a164b415aee2428b4a9f;hb=031b4a8ea78fdbb776a1c5991f246b4f2a3e7ed1;hpb=20a6dc6adf6f00afe244596b87c96361d040989f

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ab618bb..a510530 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,11 +39,11 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.PrivacyCell" >
 
-        <!-- The label uses the short name so that it isn't truncated under the icon in the launcher on most phones.
+        <!-- PrivacyCellActivity.  The label uses the short name so that it isn't truncated under the icon in the launcher on most phones.
             `android:launchMode="singleTask"` makes the app launch in a new task instead of inside the task of the program that sends it an intent.
             It also makes it reuse an existing Privacy Cell activity if available instead of launching a new one. -->
         <activity
-            android:name=".activities.PrivacyCell"
+            android:name=".activities.PrivacyCellActivity"
             android:label="@string/cell"
             android:launchMode="singleTask"
             android:screenOrientation="fullUser"
@@ -54,5 +54,12 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <!-- Settings Activity.  The `parentActivityName` is used when restarting Privacy Cell.-->
+        <activity
+            android:name=".activities.SettingsActivity"
+            android:label="@string/settings"
+            android:screenOrientation="fullUser"
+            android:parentActivityName=".activities.PrivacyCellActivity" />
     </application>
 </manifest>
\ No newline at end of file