commit 1ddcf0f2bf44d3c9db89112ef52510d9b2433ac4
author Vikram Aggarwal <viki@google.com> Fri Jan 13 11:45:02 2012 -0800
committer Vikram Aggarwal <viki@google.com> Tue Jan 24 14:49:16 2012 -0800
tree 99a71e90f97326c290ff607397afefc078acb22f
parent 97bca7b52aa2840494753d700a641161099cde23

Adding more ActivityController dependencies

ui.ControllableActivity added from Gmail.
One pane layout files brought in.
Minor changes to make everything work with the test activity.

Change-Id: I8cacd5f36394fe4a786590e2e381369a3afb5494

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6586ef6..d86afe0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,6 +24,8 @@
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <!-- Allows access to EmailProvider (EAS/IMAP/POP3) -->
     <uses-permission android:name="com.android.email.permission.ACCESS_PROVIDER"/>
+    <uses-permission android:name="android.permission.NFC" />
+
     <application
         android:icon="@mipmap/ic_launcher_mail"
         android:label="@string/app_name"
@@ -41,7 +43,10 @@
         <activity android:name=".browse.ConversationViewActivity" />
         <activity android:name=".browse.FolderItem" />
         <activity
-           android:name=".browse.ActionbarActivity"
+           android:name=".ui.ActionbarActivity"
+           android:uiOptions="splitActionBarWhenNarrow" />
+        <activity
+           android:name=".ui.MailActivity"
            android:uiOptions="splitActionBarWhenNarrow" />
 
         <provider