You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by ia...@apache.org on 2015/07/13 14:54:45 UTC
[27/34] incubator-taverna-mobile git commit: added dropbox activity
added dropbox activity
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/8b8d5b97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/8b8d5b97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/8b8d5b97
Branch: refs/heads/master
Commit: 8b8d5b979ad9a07499cbe87376560adf1a452613
Parents: 1619a17
Author: larrytech7 <la...@gmail.com>
Authored: Sat Jul 11 23:20:42 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Sat Jul 11 23:20:42 2015 +0100
----------------------------------------------------------------------
app/src/main/AndroidManifest.xml | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8b8d5b97/app/src/main/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bd49514..930847e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -45,7 +45,7 @@ limitations under the License.
<activity
android:name=".activities.DashboardMainActivity"
android:label="@string/title_activity_dashboard_main"
- android:launchMode="singleTop">
+ android:launchMode="singleTop" >
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
@@ -75,11 +75,31 @@ limitations under the License.
<activity
android:name=".activities.SettingsActivity"
android:label="@string/title_activity_settings"
- android:parentActivityName="org.apache.taverna.mobile.activities.DashboardMainActivity" >
+ android:parentActivityName=".activities.DashboardMainActivity" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.apache.taverna.mobile.activities.DashboardMainActivity" />
</activity>
+ <activity
+ android:name=".activities.RunResult"
+ android:label="@string/title_activity_run_result"
+ android:parentActivityName=".activities.WorkflowDetailActivity" >
+ <meta-data
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value="org.apache.taverna.mobile.activities.WorkflowDetailActivity" />
+ </activity>
+ <activity
+ android:name="com.dropbox.client2.android.AuthActivity"
+ android:launchMode="singleTask"
+ android:configChanges="orientation|keyboard">
+ <intent-filter>
+ <!-- Change this to be db- followed by your app key -->
+ <data android:scheme="db-doicbvkfyzligh2" />
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
</application>
</manifest>