Skip to content

Commit

Permalink
Remove some more bloat (ftctechnh#1)
Browse files Browse the repository at this point in the history
* Get rid of dex util bloat. (Not needed since OnBotJava is now history)

* Get rid of javac. (Not needed since OnBotJava is now history)

* Get rid of WirelessP2p AAR file (Not needed I guess since it builds fine without it)

* Add turbo version to about activity

* Remove 2016-17 Vuforia target files
  • Loading branch information
Frogbots4634 authored and NoahAndrews committed Oct 17, 2017
1 parent 1a8c75e commit 341ae0c
Show file tree
Hide file tree
Showing 402 changed files with 14 additions and 84,226 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
@Override
public int getCount()
{
return 5;
return 6;
}

@Override
Expand All @@ -146,6 +146,7 @@ public Item getItem(int pos) {
case 2: return getNetworkProtocolVersion();
case 3: return getConnectionInfo();
case 4: return getBuildTimeInfo();
case 5: return getTurboVersion();
}
return new Item();
}
Expand Down Expand Up @@ -189,6 +190,13 @@ private Item getBuildTimeInfo() {
i.info = getBuildTime();
return i;
}

private Item getTurboVersion() {
Item i = new Item();
i.title = getString(R.string.about_turbo_version_title);
i.info = getString(R.string.about_turbo_version);
return i;
}
};

aboutList.setAdapter(adapter);
Expand Down
5 changes: 5 additions & 0 deletions FtcCommon/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="about_turbo_version_title">Turbo Version</string>
<string name="about_turbo_version">1.1</string>
</resources>
1 change: 0 additions & 1 deletion FtcRobotController/build.release.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ dependencies {
compile project(':Inspection')
compile project(':Hardware')
compile project(':FtcCommon')
compile (name:'Analytics-release', ext:'aar')
compile (name:'WirelessP2p-release', ext:'aar')
}
Binary file removed FtcRobotController/src/main/assets/FTC_2016-17.dat
Binary file not shown.
9 changes: 0 additions & 9 deletions FtcRobotController/src/main/assets/FTC_2016-17.xml

This file was deleted.

Binary file removed RobotCore/libs/javac.jar
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 341ae0c

Please sign in to comment.