Imported some changes to fix encoding errors in Android Studio

polyglotprogramminginc · Mar 13, 2015 · e9d695d · e9d695d
1 parent 816e4e9
commit e9d695d
Show file tree

Hide file tree

Showing 31 changed files with 83 additions and 80 deletions.
diff --git a/README.md b/README.md
@@ -13,3 +13,6 @@ This app provides an example of how to use the MetaWear API.  It uses the sample
 The API was created with Android Developer Tools v22.6.2-1085508. It is targeted for Android 4.4.2 (API 19) SDK with Android 4.3 (API 18) as the minimum required SDK and requires a JDK compiler compliance level of 1.7.  To build the project, you will need to download the MetaWear API and configure the example app to include the API in the build path.  More information on configuring the build is available in the "Getting Started" guide, available on the MbientLab website: [https://mbientlab.com/docs/](https://mbientlab.com/docs/).
 
 By default, the app is configured to refer to the MetaWear API Eclipse project.  You may change it to link to the jar instead if you do not plan on modifying the API code.
+
+### Android Studio ###
+Starting with v2.5, a version of the project configured for Android Studio is available in the **Download** section on a release page.  Available releases can be viewed on the [GitHub Release](https://github.com/mbientlab/Metawear-SampleAndroidApp/releases) section.
diff --git a/src/com/mbientlab/metawear/app/AppFragments.java b/src/com/mbientlab/metawear/app/AppFragments.java
@@ -14,7 +14,7 @@
  * Software and/or its documentation for any purpose.
  *
  * YOU FURTHER ACKNOWLEDGE AND AGREE THAT THE SOFTWARE AND DOCUMENTATION ARE 
- * PROVIDED “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, 
+ * PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, 
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY, TITLE, 
  * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL 
  * MBIENTLAB OR ITS LICENSORS BE LIABLE OR OBLIGATED UNDER CONTRACT, NEGLIGENCE, 

diff --git a/src/com/mbientlab/metawear/app/ModuleListFragment.java b/src/com/mbientlab/metawear/app/ModuleListFragment.java
@@ -14,7 +14,7 @@
  * Software and/or its documentation for any purpose.
  *
  * YOU FURTHER ACKNOWLEDGE AND AGREE THAT THE SOFTWARE AND DOCUMENTATION ARE 
- * PROVIDED “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, 
+ * PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, 
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY, TITLE, 
  * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL 
  * MBIENTLAB OR ITS LICENSORS BE LIABLE OR OBLIGATED UNDER CONTRACT, NEGLIGENCE, 

diff --git a/src/com/mbientlab/metawear/app/TemperatureFragment.java b/src/com/mbientlab/metawear/app/TemperatureFragment.java
@@ -121,7 +121,7 @@ public void onClick(View v) {
                 if (mwMnger.controllerReady()) {
                     try {
                         tempController.enableSampling()
-                                .withSampingPeriod(Integer.parseInt(tempPolling.getEditableText().toString()))
+                                .withSamplingPeriod(Integer.parseInt(tempPolling.getEditableText().toString()))
                                 .withTemperatureDelta(Float.parseFloat(tempDelta.getEditableText().toString()))
                                 .withTemperatureBoundary(Float.parseFloat(tempLower.getEditableText().toString()), 
                                         Float.parseFloat(tempUpper.getEditableText().toString()))

diff --git a/src/com/mbientlab/metawear/app/popup/AccelerometerSettings.java b/src/com/mbientlab/metawear/app/popup/AccelerometerSettings.java
@@ -14,7 +14,7 @@
  * Software and/or its documentation for any purpose.
  *
  * YOU FURTHER ACKNOWLEDGE AND AGREE THAT THE SOFTWARE AND DOCUMENTATION ARE 
- * PROVIDED “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, 
+ * PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, 
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY, TITLE, 
  * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL 
  * MBIENTLAB OR ITS LICENSORS BE LIABLE OR OBLIGATED UNDER CONTRACT, NEGLIGENCE, 

diff --git a/src/com/mbientlab/metawear/app/popup/DataPlotFragment.java b/src/com/mbientlab/metawear/app/popup/DataPlotFragment.java
@@ -14,7 +14,7 @@
  * Software and/or its documentation for any purpose.
  *
  * YOU FURTHER ACKNOWLEDGE AND AGREE THAT THE SOFTWARE AND DOCUMENTATION ARE 
- * PROVIDED “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, 
+ * PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, 
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY, TITLE, 
  * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL 
  * MBIENTLAB OR ITS LICENSORS BE LIABLE OR OBLIGATED UNDER CONTRACT, NEGLIGENCE, 

diff --git a/src/no/nordicsemi/android/nrftoolbox/AppHelpFragment.java b/src/no/nordicsemi/android/nrftoolbox/AppHelpFragment.java
@@ -10,8 +10,8 @@
 /*
  * NORDIC SEMICONDUTOR EXAMPLE CODE AND LICENSE AGREEMENT
  *
- * You are receiving this document because you have obtained example code (“Software”) 
- * from Nordic Semiconductor ASA * (“Licensor”). The Software is protected by copyright 
+ * You are receiving this document because you have obtained example code ("Software") 
+ * from Nordic Semiconductor ASA * ("Licensor"). The Software is protected by copyright 
  * laws and international treaties. All intellectual property rights related to the 
  * Software is the property of the Licensor. This document is a license agreement governing 
  * your rights and obligations regarding usage of the Software. Any variation to the terms 
@@ -36,7 +36,7 @@
  * You are not allowed to remove, alter or destroy any proprietary, 
  * trademark or copyright markings or notices placed upon or contained with the Software.
  *     
- * You shall not use Licensor’s name or trademarks without Licensor’s prior consent.
+ * You shall not use Licensor's name or trademarks without Licensor's prior consent.
  * 
  * == Disclaimer of warranties and limitation of liability ==
  * 

diff --git a/src/no/nordicsemi/android/nrftoolbox/dfu/DeviceDisconnectedException.java b/src/no/nordicsemi/android/nrftoolbox/dfu/DeviceDisconnectedException.java
@@ -10,8 +10,8 @@
 /*
  * NORDIC SEMICONDUTOR EXAMPLE CODE AND LICENSE AGREEMENT
  *
- * You are receiving this document because you have obtained example code (“Software”) 
- * from Nordic Semiconductor ASA * (“Licensor”). The Software is protected by copyright 
+ * You are receiving this document because you have obtained example code ("Software") 
+ * from Nordic Semiconductor ASA * ("Licensor"). The Software is protected by copyright 
  * laws and international treaties. All intellectual property rights related to the 
  * Software is the property of the Licensor. This document is a license agreement governing 
  * your rights and obligations regarding usage of the Software. Any variation to the terms 
@@ -36,7 +36,7 @@
  * You are not allowed to remove, alter or destroy any proprietary, 
  * trademark or copyright markings or notices placed upon or contained with the Software.
  *     
- * You shall not use Licensor’s name or trademarks without Licensor’s prior consent.
+ * You shall not use Licensor's name or trademarks without Licensor's prior consent.
  * 
  * == Disclaimer of warranties and limitation of liability ==
  * 

diff --git a/src/no/nordicsemi/android/nrftoolbox/dfu/DfuActivity.java b/src/no/nordicsemi/android/nrftoolbox/dfu/DfuActivity.java
@@ -8,8 +8,8 @@
 /*
  * NORDIC SEMICONDUTOR EXAMPLE CODE AND LICENSE AGREEMENT
  *
- * You are receiving this document because you have obtained example code (“Software”) 
- * from Nordic Semiconductor ASA * (“Licensor”). The Software is protected by copyright 
+ * You are receiving this document because you have obtained example code ("Software") 
+ * from Nordic Semiconductor ASA * ("Licensor"). The Software is protected by copyright 
  * laws and international treaties. All intellectual property rights related to the 
  * Software is the property of the Licensor. This document is a license agreement governing 
  * your rights and obligations regarding usage of the Software. Any variation to the terms 
@@ -34,7 +34,7 @@
  * You are not allowed to remove, alter or destroy any proprietary, 
  * trademark or copyright markings or notices placed upon or contained with the Software.
  *     
- * You shall not use Licensor’s name or trademarks without Licensor’s prior consent.
+ * You shall not use Licensor's name or trademarks without Licensor's prior consent.
  * 
  * == Disclaimer of warranties and limitation of liability ==
  * 

diff --git a/src/no/nordicsemi/android/nrftoolbox/dfu/DfuException.java b/src/no/nordicsemi/android/nrftoolbox/dfu/DfuException.java
@@ -10,8 +10,8 @@
 /*
  * NORDIC SEMICONDUTOR EXAMPLE CODE AND LICENSE AGREEMENT
  *
- * You are receiving this document because you have obtained example code (“Software”) 
- * from Nordic Semiconductor ASA * (“Licensor”). The Software is protected by copyright 
+ * You are receiving this document because you have obtained example code ("Software") 
+ * from Nordic Semiconductor ASA * ("Licensor"). The Software is protected by copyright 
  * laws and international treaties. All intellectual property rights related to the 
  * Software is the property of the Licensor. This document is a license agreement governing 
  * your rights and obligations regarding usage of the Software. Any variation to the terms 
@@ -36,7 +36,7 @@
  * You are not allowed to remove, alter or destroy any proprietary, 
  * trademark or copyright markings or notices placed upon or contained with the Software.
  *     
- * You shall not use Licensor’s name or trademarks without Licensor’s prior consent.
+ * You shall not use Licensor's name or trademarks without Licensor's prior consent.
  * 
  * == Disclaimer of warranties and limitation of liability ==
  * 

diff --git a/src/no/nordicsemi/android/nrftoolbox/dfu/DfuInitiatorActivity.java b/src/no/nordicsemi/android/nrftoolbox/dfu/DfuInitiatorActivity.java
@@ -10,8 +10,8 @@
 /*
  * NORDIC SEMICONDUTOR EXAMPLE CODE AND LICENSE AGREEMENT
  *
- * You are receiving this document because you have obtained example code (“Software”) 
- * from Nordic Semiconductor ASA * (“Licensor”). The Software is protected by copyright 
+ * You are receiving this document because you have obtained example code ("Software") 
+ * from Nordic Semiconductor ASA * ("Licensor"). The Software is protected by copyright 
  * laws and international treaties. All intellectual property rights related to the 
  * Software is the property of the Licensor. This document is a license agreement governing 
  * your rights and obligations regarding usage of the Software. Any variation to the terms 
@@ -36,7 +36,7 @@
  * You are not allowed to remove, alter or destroy any proprietary, 
  * trademark or copyright markings or notices placed upon or contained with the Software.
  *     
- * You shall not use Licensor’s name or trademarks without Licensor’s prior consent.
+ * You shall not use Licensor's name or trademarks without Licensor's prior consent.
  * 
  * == Disclaimer of warranties and limitation of liability ==
  * 

diff --git a/src/no/nordicsemi/android/nrftoolbox/dfu/DfuService.java b/src/no/nordicsemi/android/nrftoolbox/dfu/DfuService.java
@@ -10,8 +10,8 @@
 /*
  * NORDIC SEMICONDUTOR EXAMPLE CODE AND LICENSE AGREEMENT
  *
- * You are receiving this document because you have obtained example code (“Software”) 
- * from Nordic Semiconductor ASA * (“Licensor”). The Software is protected by copyright 
+ * You are receiving this document because you have obtained example code ("Software") 
+ * from Nordic Semiconductor ASA * ("Licensor"). The Software is protected by copyright 
  * laws and international treaties. All intellectual property rights related to the 
  * Software is the property of the Licensor. This document is a license agreement governing 
  * your rights and obligations regarding usage of the Software. Any variation to the terms 
@@ -36,7 +36,7 @@
  * You are not allowed to remove, alter or destroy any proprietary, 
  * trademark or copyright markings or notices placed upon or contained with the Software.
  *     
- * You shall not use Licensor’s name or trademarks without Licensor’s prior consent.
+ * You shall not use Licensor's name or trademarks without Licensor's prior consent.
  * 
  * == Disclaimer of warranties and limitation of liability ==
  * 

diff --git a/src/no/nordicsemi/android/nrftoolbox/dfu/HexFileValidationException.java b/src/no/nordicsemi/android/nrftoolbox/dfu/HexFileValidationException.java
@@ -10,8 +10,8 @@
 /*
  * NORDIC SEMICONDUTOR EXAMPLE CODE AND LICENSE AGREEMENT
  *
- * You are receiving this document because you have obtained example code (“Software”) 
- * from Nordic Semiconductor ASA * (“Licensor”). The Software is protected by copyright 
+ * You are receiving this document because you have obtained example code ("Software") 
+ * from Nordic Semiconductor ASA * ("Licensor"). The Software is protected by copyright 
  * laws and international treaties. All intellectual property rights related to the 
  * Software is the property of the Licensor. This document is a license agreement governing 
  * your rights and obligations regarding usage of the Software. Any variation to the terms 
@@ -36,7 +36,7 @@
  * You are not allowed to remove, alter or destroy any proprietary, 
  * trademark or copyright markings or notices placed upon or contained with the Software.
  *     
- * You shall not use Licensor’s name or trademarks without Licensor’s prior consent.
+ * You shall not use Licensor's name or trademarks without Licensor's prior consent.
  * 
  * == Disclaimer of warranties and limitation of liability ==
  * 

diff --git a/src/no/nordicsemi/android/nrftoolbox/dfu/HexInputStream.java b/src/no/nordicsemi/android/nrftoolbox/dfu/HexInputStream.java
@@ -10,8 +10,8 @@
 /*
  * NORDIC SEMICONDUTOR EXAMPLE CODE AND LICENSE AGREEMENT
  *
- * You are receiving this document because you have obtained example code (“Software”) 
- * from Nordic Semiconductor ASA * (“Licensor”). The Software is protected by copyright 
+ * You are receiving this document because you have obtained example code ("Software") 
+ * from Nordic Semiconductor ASA * ("Licensor"). The Software is protected by copyright 
  * laws and international treaties. All intellectual property rights related to the 
  * Software is the property of the Licensor. This document is a license agreement governing 
  * your rights and obligations regarding usage of the Software. Any variation to the terms 
@@ -36,7 +36,7 @@
  * You are not allowed to remove, alter or destroy any proprietary, 
  * trademark or copyright markings or notices placed upon or contained with the Software.
  *     
- * You shall not use Licensor’s name or trademarks without Licensor’s prior consent.
+ * You shall not use Licensor's name or trademarks without Licensor's prior consent.
  * 
  * == Disclaimer of warranties and limitation of liability ==
  * 

diff --git a/src/no/nordicsemi/android/nrftoolbox/dfu/NotificationActivity.java b/src/no/nordicsemi/android/nrftoolbox/dfu/NotificationActivity.java
@@ -10,8 +10,8 @@
 /*
  * NORDIC SEMICONDUTOR EXAMPLE CODE AND LICENSE AGREEMENT
  *
- * You are receiving this document because you have obtained example code (“Software”) 
- * from Nordic Semiconductor ASA * (“Licensor”). The Software is protected by copyright 
+ * You are receiving this document because you have obtained example code ("Software") 
+ * from Nordic Semiconductor ASA * ("Licensor"). The Software is protected by copyright 
  * laws and international treaties. All intellectual property rights related to the 
  * Software is the property of the Licensor. This document is a license agreement governing 
  * your rights and obligations regarding usage of the Software. Any variation to the terms 
@@ -36,7 +36,7 @@
  * You are not allowed to remove, alter or destroy any proprietary, 
  * trademark or copyright markings or notices placed upon or contained with the Software.
  *     
- * You shall not use Licensor’s name or trademarks without Licensor’s prior consent.
+ * You shall not use Licensor's name or trademarks without Licensor's prior consent.
  * 
  * == Disclaimer of warranties and limitation of liability ==
  * 

diff --git a/src/no/nordicsemi/android/nrftoolbox/dfu/RemoteDfuException.java b/src/no/nordicsemi/android/nrftoolbox/dfu/RemoteDfuException.java
@@ -10,8 +10,8 @@
 /*
  * NORDIC SEMICONDUTOR EXAMPLE CODE AND LICENSE AGREEMENT
  *
- * You are receiving this document because you have obtained example code (“Software”) 
- * from Nordic Semiconductor ASA * (“Licensor”). The Software is protected by copyright 
+ * You are receiving this document because you have obtained example code ("Software") 
+ * from Nordic Semiconductor ASA * ("Licensor"). The Software is protected by copyright 
  * laws and international treaties. All intellectual property rights related to the 
  * Software is the property of the Licensor. This document is a license agreement governing 
  * your rights and obligations regarding usage of the Software. Any variation to the terms 
@@ -36,7 +36,7 @@
  * You are not allowed to remove, alter or destroy any proprietary, 
  * trademark or copyright markings or notices placed upon or contained with the Software.
  *     
- * You shall not use Licensor’s name or trademarks without Licensor’s prior consent.
+ * You shall not use Licensor's name or trademarks without Licensor's prior consent.
  * 
  * == Disclaimer of warranties and limitation of liability ==
  * 

diff --git a/src/no/nordicsemi/android/nrftoolbox/dfu/UnknownResponseException.java b/src/no/nordicsemi/android/nrftoolbox/dfu/UnknownResponseException.java
@@ -10,8 +10,8 @@
 /*
  * NORDIC SEMICONDUTOR EXAMPLE CODE AND LICENSE AGREEMENT
  *
- * You are receiving this document because you have obtained example code (“Software”) 
- * from Nordic Semiconductor ASA * (“Licensor”). The Software is protected by copyright 
+ * You are receiving this document because you have obtained example code ("Software") 
+ * from Nordic Semiconductor ASA * ("Licensor"). The Software is protected by copyright 
  * laws and international treaties. All intellectual property rights related to the 
  * Software is the property of the Licensor. This document is a license agreement governing 
  * your rights and obligations regarding usage of the Software. Any variation to the terms 
@@ -36,7 +36,7 @@
  * You are not allowed to remove, alter or destroy any proprietary, 
  * trademark or copyright markings or notices placed upon or contained with the Software.
  *     
- * You shall not use Licensor’s name or trademarks without Licensor’s prior consent.
+ * You shall not use Licensor's name or trademarks without Licensor's prior consent.
  * 
  * == Disclaimer of warranties and limitation of liability ==
  * 

diff --git a/src/no/nordicsemi/android/nrftoolbox/dfu/UploadAbortedException.java b/src/no/nordicsemi/android/nrftoolbox/dfu/UploadAbortedException.java
@@ -10,8 +10,8 @@
 /*
  * NORDIC SEMICONDUTOR EXAMPLE CODE AND LICENSE AGREEMENT
  *
- * You are receiving this document because you have obtained example code (“Software”) 
- * from Nordic Semiconductor ASA * (“Licensor”). The Software is protected by copyright 
+ * You are receiving this document because you have obtained example code ("Software") 
+ * from Nordic Semiconductor ASA * ("Licensor"). The Software is protected by copyright 
  * laws and international treaties. All intellectual property rights related to the 
  * Software is the property of the Licensor. This document is a license agreement governing 
  * your rights and obligations regarding usage of the Software. Any variation to the terms 
@@ -36,7 +36,7 @@
  * You are not allowed to remove, alter or destroy any proprietary, 
  * trademark or copyright markings or notices placed upon or contained with the Software.
  *     
- * You shall not use Licensor’s name or trademarks without Licensor’s prior consent.
+ * You shall not use Licensor's name or trademarks without Licensor's prior consent.
  * 
  * == Disclaimer of warranties and limitation of liability ==
  * 

diff --git a/src/no/nordicsemi/android/nrftoolbox/dfu/adapter/FileBrowserAppsAdapter.java b/src/no/nordicsemi/android/nrftoolbox/dfu/adapter/FileBrowserAppsAdapter.java
@@ -10,8 +10,8 @@
 /*
  * NORDIC SEMICONDUTOR EXAMPLE CODE AND LICENSE AGREEMENT
  *
- * You are receiving this document because you have obtained example code (“Software”) 
- * from Nordic Semiconductor ASA * (“Licensor”). The Software is protected by copyright 
+ * You are receiving this document because you have obtained example code ("Software") 
+ * from Nordic Semiconductor ASA * ("Licensor"). The Software is protected by copyright 
  * laws and international treaties. All intellectual property rights related to the 
  * Software is the property of the Licensor. This document is a license agreement governing 
  * your rights and obligations regarding usage of the Software. Any variation to the terms 
@@ -36,7 +36,7 @@
  * You are not allowed to remove, alter or destroy any proprietary, 
  * trademark or copyright markings or notices placed upon or contained with the Software.
  *     
- * You shall not use Licensor’s name or trademarks without Licensor’s prior consent.
+ * You shall not use Licensor's name or trademarks without Licensor's prior consent.
  * 
  * == Disclaimer of warranties and limitation of liability ==
  * 

diff --git a/src/no/nordicsemi/android/nrftoolbox/dfu/fragment/UploadCancelFragment.java b/src/no/nordicsemi/android/nrftoolbox/dfu/fragment/UploadCancelFragment.java
@@ -10,8 +10,8 @@
 /*
  * NORDIC SEMICONDUTOR EXAMPLE CODE AND LICENSE AGREEMENT
  *
- * You are receiving this document because you have obtained example code (“Software”) 
- * from Nordic Semiconductor ASA * (“Licensor”). The Software is protected by copyright 
+ * You are receiving this document because you have obtained example code ("Software") 
+ * from Nordic Semiconductor ASA * ("Licensor"). The Software is protected by copyright 
  * laws and international treaties. All intellectual property rights related to the 
  * Software is the property of the Licensor. This document is a license agreement governing 
  * your rights and obligations regarding usage of the Software. Any variation to the terms 
@@ -36,7 +36,7 @@
  * You are not allowed to remove, alter or destroy any proprietary, 
  * trademark or copyright markings or notices placed upon or contained with the Software.
  *     
- * You shall not use Licensor’s name or trademarks without Licensor’s prior consent.
+ * You shall not use Licensor's name or trademarks without Licensor's prior consent.
  * 
  * == Disclaimer of warranties and limitation of liability ==
  *