From 8c30efa4cdca485874404bd201aa8ad4491558c3 Mon Sep 17 00:00:00 2001 From: RobertAtkinson Date: Sat, 3 Oct 2015 10:14:35 -0700 Subject: [PATCH 1/6] remove activities located in ftcrobotcontroller binary Former-commit-id: ccc20306aa9fc481649523ffb0de434a20a0a205 Former-commit-id: 3dbff0d51ee0bf1387701bc92286b435cd4d8d8c --- .../src/main/AndroidManifest.xml | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/FtcRobotController/src/main/AndroidManifest.xml b/FtcRobotController/src/main/AndroidManifest.xml index db1e8977415..e9619398cf2 100644 --- a/FtcRobotController/src/main/AndroidManifest.xml +++ b/FtcRobotController/src/main/AndroidManifest.xml @@ -45,46 +45,16 @@ android:launchMode="singleTask" > - - - - - - - - - - - - - - - - From 9ce49cf3d2ac932ce17fee605809d5b744bd8821 Mon Sep 17 00:00:00 2001 From: RobertAtkinson Date: Sat, 3 Oct 2015 10:19:54 -0700 Subject: [PATCH 2/6] switch library <-> application Former-commit-id: 5f99956125d930821596b02d9730fc965297a90d Former-commit-id: 81e2ef4d6b9f90d99e9c2a8d3e8bb170d6b2eaac --- FtcRobotController/FtcRobotController.iml | 2 +- FtcRobotController/build.gradle | 3 +-- YourCodeHere/build.gradle | 4 +++- YourCodeHere/src/main/AndroidManifest.xml | 12 ++++++++---- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/FtcRobotController/FtcRobotController.iml b/FtcRobotController/FtcRobotController.iml index 8a0cd07ba8f..63d071be8b5 100644 --- a/FtcRobotController/FtcRobotController.iml +++ b/FtcRobotController/FtcRobotController.iml @@ -23,6 +23,7 @@