Merge pull request #57 from arsun2/newPhilip

vib 100 ms
arsun2 · Apr 30, 2019 · d2f2546 · d2f2546
2 parents b511c51 + 19fcdc6
commit d2f2546
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/AndroidStudioProjects/cs498teamassign5/.idea/codeStyles/Project.xml b/AndroidStudioProjects/cs498teamassign5/.idea/codeStyles/Project.xml
diff --git a/...rojects/cs498teamassign5/app/src/main/java/com/example/cs498teamassign5/MainActivity.java b/...rojects/cs498teamassign5/app/src/main/java/com/example/cs498teamassign5/MainActivity.java
@@ -285,12 +285,12 @@ public void switchQuarterHelper(boolean nextGame){
     private void vibrateHelper(){
         Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
         System.out.print("vibrated\n");
-    // Vibrate for 500 milliseconds
+    // Vibrate for 100 milliseconds
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            v.vibrate(VibrationEffect.createOneShot(500, VibrationEffect.DEFAULT_AMPLITUDE));
+            v.vibrate(VibrationEffect.createOneShot(100, VibrationEffect.DEFAULT_AMPLITUDE));
         } else {
             //deprecated in API 26
-            v.vibrate(500);
+            v.vibrate(100);
         }
     }
 }