-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactored 2867 code to match 2866 and Common Code
Former-commit-id: af6f47a
- Loading branch information
1 parent
94fec36
commit 3c24956
Showing
289 changed files
with
57,145 additions
and
64,592 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+15 Bytes
(100%)
FtcRobotController/libs/Analytics-release.aar
100644 → 100755
Binary file not shown.
Binary file modified
BIN
+10.8 KB
(110%)
FtcRobotController/libs/FtcCommon-release.aar
100644 → 100755
Binary file not shown.
Binary file modified
BIN
+30.5 KB
(140%)
FtcRobotController/libs/Hardware-release.aar
100644 → 100755
Binary file not shown.
Binary file modified
BIN
-348 Bytes
(97%)
FtcRobotController/libs/ModernRobotics-release.aar
100644 → 100755
Binary file not shown.
Empty file.
Binary file modified
BIN
+12.7 KB
(100%)
FtcRobotController/libs/RobotCore-release.aar
100644 → 100755
Binary file not shown.
Binary file modified
BIN
-2 Bytes
(100%)
FtcRobotController/libs/WirelessP2p-release.aar
100644 → 100755
Binary file not shown.
168 changes: 88 additions & 80 deletions
168
FtcRobotController/src/main/AndroidManifest.xml
100644 → 100755
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,90 +1,98 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| package="com.qualcomm.ftcrobotcontroller" | ||
| android:versionCode="4" | ||
| android:versionName="1.2"> | ||
| <manifest | ||
| package="com.qualcomm.ftcrobotcontroller" | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:versionCode="7" | ||
| android:versionName="1.6"> | ||
|
|
||
|
|
||
| <uses-permission | ||
| android:name="android.permission.ACCESS_WIFI_STATE" | ||
| android:required="true" /> | ||
| <uses-permission | ||
| android:name="android.permission.CHANGE_WIFI_STATE" | ||
| android:required="true" /> | ||
| <uses-permission | ||
| android:name="android.permission.ACCESS_NETWORK_STATE" | ||
| android:required="true" /> | ||
| <uses-permission | ||
| android:name="android.permission.CHANGE_NETWORK_STATE" | ||
| android:required="true" /> | ||
| <uses-permission | ||
| android:name="android.permission.INTERNET" | ||
| android:required="true" /> | ||
| <uses-permission | ||
| android:name="android.permission.WRITE_EXTERNAL_STORAGE" | ||
| android:required="true" /> | ||
| <uses-permission | ||
| android:name="android.permission.READ_EXTERNAL_STORAGE" | ||
| android:required="true" /> | ||
| <uses-permission | ||
| android:name="android.permission.WRITE_SETTINGS" | ||
| android:required="true" /> | ||
| <uses-permission | ||
| android:name="android.permission.ACCESS_WIFI_STATE" | ||
| android:required="true"/> | ||
| <uses-permission | ||
| android:name="android.permission.CHANGE_WIFI_STATE" | ||
| android:required="true"/> | ||
| <uses-permission | ||
| android:name="android.permission.WAKE_LOCK" | ||
| android:required="true"/> | ||
| <uses-permission | ||
| android:name="android.permission.ACCESS_NETWORK_STATE" | ||
| android:required="true"/> | ||
| <uses-permission | ||
| android:name="android.permission.CHANGE_NETWORK_STATE" | ||
| android:required="true"/> | ||
| <uses-permission | ||
| android:name="android.permission.INTERNET" | ||
| android:required="true"/> | ||
| <uses-permission | ||
| android:name="android.permission.WRITE_EXTERNAL_STORAGE" | ||
| android:required="true"/> | ||
| <uses-permission | ||
| android:name="android.permission.READ_EXTERNAL_STORAGE" | ||
| android:required="true"/> | ||
| <uses-permission | ||
| android:name="android.permission.WRITE_SETTINGS" | ||
| android:required="true"/> | ||
|
|
||
| <uses-feature android:name="android.hardware.usb.accessory" /> | ||
| <uses-feature android:name="android.hardware.usb.accessory"/> | ||
|
|
||
| <application | ||
| android:allowBackup="true" | ||
| android:icon="@drawable/ic_launcher" | ||
| android:label="@string/app_name" | ||
| android:theme="@style/AppTheme" > | ||
| <activity | ||
| android:name=".FtcRobotControllerActivity" | ||
| android:configChanges="orientation|screenSize" | ||
| android:label="@string/app_name" | ||
| android:launchMode="singleTask" > | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
| <application | ||
| android:name=".MyApplication" | ||
| android:allowBackup="true" | ||
| android:icon="@drawable/ic_launcher" | ||
| android:label="@string/app_name" | ||
| android:theme="@style/AppTheme"> | ||
| <activity | ||
| android:name=".FtcRobotControllerActivity" | ||
| android:configChanges="orientation|screenSize" | ||
| android:label="@string/app_name" | ||
| android:launchMode="singleTask"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN"/> | ||
| <category android:name="android.intent.category.LAUNCHER"/> | ||
| </intent-filter> | ||
|
|
||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| <intent-filter> | ||
| <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"/> | ||
| </intent-filter> | ||
|
|
||
| <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" /> | ||
| </intent-filter> | ||
| <meta-data | ||
| android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" | ||
| android:resource="@xml/device_filter"/> | ||
| </activity> | ||
| <activity | ||
| android:name="com.qualcomm.ftccommon.FtcRobotControllerSettingsActivity" | ||
| android:label="@string/settings_activity"> | ||
| </activity> | ||
|
|
||
| <meta-data | ||
| android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" | ||
| android:resource="@xml/device_filter" /> | ||
| </activity> | ||
| <activity | ||
| android:name="com.qualcomm.ftccommon.FtcRobotControllerSettingsActivity" | ||
| android:label="@string/settings_activity" > | ||
| </activity> | ||
| <service | ||
| android:name="com.qualcomm.ftccommon.FtcRobotControllerService" | ||
| android:enabled="true" /> | ||
| <activity | ||
| android:name="com.qualcomm.ftccommon.configuration.FtcLoadFileActivity" | ||
| android:label="@string/configure_activity" | ||
| tools:replace="android:label"> | ||
| </activity> | ||
| <activity | ||
| android:name="com.qualcomm.ftccommon.FtcWifiChannelSelectorActivity" | ||
| android:label="@string/title_activity_wifi_channel_selector" | ||
| tools:replace="android:label"> | ||
| </activity> | ||
| <activity | ||
| android:name="com.qualcomm.ftccommon.ConfigWifiDirectActivity" | ||
| android:label="@string/title_activity_config_wifi_direct" /> | ||
| <activity | ||
| android:name="com.qualcomm.ftccommon.ViewLogsActivity" | ||
| android:configChanges="orientation|screenSize" | ||
| android:label="@string/title_activity_view_logs" | ||
| tools:replace="android:label"> | ||
| <intent-filter> | ||
| <action android:name="com.qualcomm.ftcrobotcontroller.VIEW_LOGS"/> | ||
| <category android:name="android.intent.category.DEFAULT" /> | ||
| </intent-filter> | ||
| </activity> | ||
| </application> | ||
| <service | ||
| android:name="com.qualcomm.ftccommon.FtcRobotControllerService" | ||
| android:enabled="true"/> | ||
|
|
||
| <activity | ||
| android:name="com.qualcomm.ftccommon.configuration.FtcLoadFileActivity" | ||
| android:label="@string/configure_activity" | ||
| tools:replace="android:label"> | ||
| </activity> | ||
| <activity | ||
| android:name="com.qualcomm.ftccommon.FtcWifiChannelSelectorActivity" | ||
| android:label="@string/title_activity_wifi_channel_selector" | ||
| tools:replace="android:label"> | ||
| </activity> | ||
| <activity | ||
| android:name="com.qualcomm.ftccommon.ConfigWifiDirectActivity" | ||
| android:label="@string/title_activity_config_wifi_direct"/> | ||
| <activity | ||
| android:name="com.qualcomm.ftccommon.ViewLogsActivity" | ||
| android:configChanges="orientation|screenSize" | ||
| android:label="@string/title_activity_view_logs" | ||
| tools:replace="android:label"> | ||
| <intent-filter> | ||
| <action android:name="com.qualcomm.ftcrobotcontroller.VIEW_LOGS"/> | ||
| <category android:name="android.intent.category.DEFAULT"/> | ||
| </intent-filter> | ||
| </activity> | ||
| </application> | ||
|
|
||
| </manifest> |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.