Debugged sensitivity spinner.

src/main/java/com/example/pharmacy/frontEnd/AdvancedSettings.java

@@ -99,8 +99,8 @@ public class AdvancedSettings extends AppCompatActivity {
         int notifyGap = Integer.parseInt(((Spinner)findViewById(R.id.PeriodSpinner)).getSelectedItem().toString());
         int spinnerCPos = ((Spinner)findViewById(R.id.ColourSpinner)).getSelectedItemPosition();
         String colour = ((Spinner)findViewById(R.id.ColourSpinner)).getSelectedItem().toString();
-        int spinnerAPos = ((Spinner)findViewById(R.id.ColourSpinner)).getSelectedItemPosition();
-        String sensitivity = ((Spinner)findViewById(R.id.ColourSpinner)).getSelectedItem().toString();
+        int spinnerAPos = ((Spinner)findViewById(R.id.AccelSpinner)).getSelectedItemPosition();
+        String sensitivity = ((Spinner)findViewById(R.id.AccelSpinner)).getSelectedItem().toString();
         SharedPreferences.Editor editor = sharedPref.edit();
         editor.putInt(getString(R.string.led_period_pos), spinnerPPos);
         editor.putInt(getString(R.string.led_period), notifyGap);

src/main/java/com/example/stimulusStrategy/Accelerometer.java

@@ -35,6 +35,7 @@ public class Accelerometer extends Service implements StimulusStrategy, SensorEv
 
     private SensorManager mSensorManager;
     private AlarmManager am;
+    private SharedPreferences preferences;
    //private Context context;
     private int startId;
     private float[] history = new float[3];
@@ -42,18 +43,21 @@ public class Accelerometer extends Service implements StimulusStrategy, SensorEv
     private long historyTime;
     private int prevMinutes = 0;
     private int minutes;
-
+    private double sensitivity = 0.5;
+    private enum sensitivityLevel{
+        VERY_LOW,LOW, NORMAL, HIGH, VERY_HIGH;
+    }
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         Log.d("ACCEL", "CREATED ACCEL");
         historyTime = SystemClock.elapsedRealtimeNanos();
+        preferences = getSharedPreferences(getString(R.string.preference_file_key), Context.MODE_PRIVATE);
+        sensitivity = (sensitivity * sensitivityLevel.valueOf(preferences.getString(getString(R.string.accel_sensitivity), "NORMAL")).ordinal()) + 0.5;
+        Log.d("SENSORSENSE", String.valueOf(sensitivity));
         this.startId = startId;
         mSensorManager = (SensorManager) this.getSystemService(Context.SENSOR_SERVICE);
         mSensorManager.registerListener(this, mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER), 600000000);
-        //Sampling period is still far too often here.
-        //Parameters to be set here such as delay etc.
-        //Slightly better when app is not in foreground
         am = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
         setUpDailyProgress();
         setUpClock();
@@ -110,13 +114,14 @@ public class Accelerometer extends Service implements StimulusStrategy, SensorEv
         //Google API Activity Detection client??
         //2 Manual options and an existing (API) option
 
+
         int moved = 0;
 
         Log.d("ACCEL", "SENSOR EVENT");
 
         for(int i = 0; i < history.length; i++) {
-            if (-0.2 > (history[i] - event.values[i])
-                    || (history[i] - event.values[i]) > 0.2) {
+            if ((-1*sensitivity) > (history[i] - event.values[i])
+                    || (history[i] - event.values[i]) > sensitivity) {
                 moved++;
             }
         }

src/main/res/values/string-arrays.xml

@@ -36,9 +36,9 @@
     </string-array>
     <string-array name="accel_sensitivities">
         <item>NORMAL</item>
-        <item>VERY HIGH</item>
+        <item>VERY_HIGH</item>
         <item>HIGH</item>
         <item>LOW</item>
-        <item>VERY LOW</item>
+        <item>VERY_LOW</item>
     </string-array>
 </resources>
\ No newline at end of file