From d33855b860d702a002027c5684c79fc6ee2fd719 Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Tue, 24 Apr 2018 17:15:05 -0300
Subject: [PATCH] Advance the haptic feedback from onClick to onPressDown

---
 scripts/system/+android/actionbar.js | 11 ++++++++---
 scripts/system/+android/audio.js     |  9 ++++++---
 scripts/system/+android/modes.js     | 17 ++++++++++++-----
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/scripts/system/+android/actionbar.js b/scripts/system/+android/actionbar.js
index 368f5b373c..c23ce89d4c 100644
--- a/scripts/system/+android/actionbar.js
+++ b/scripts/system/+android/actionbar.js
@@ -33,19 +33,24 @@ function init() {
         hoverBgOpacity: 0.0,
         activeBgOpacity: 0.0
     });
-
-    backButton.clicked.connect(onBackPressed);
+    
+    backButton.entered.connect(onBackPressed);
+    backButton.clicked.connect(onBackClicked);
 }
 
 function onBackPressed() {
    App.performHapticFeedback("CONTEXT_CLICK");
+}
+
+function onBackClicked() {
    App.openAndroidActivity("Home");
 }
 
 
 Script.scriptEnding.connect(function() {
     if(backButton) {
-        backButton.clicked.disconnect(onBackPressed);
+        backButton.entered.disconnect(onBackPressed);
+        backButton.clicked.disconnect(onBackClicked);
     }
 });
 
diff --git a/scripts/system/+android/audio.js b/scripts/system/+android/audio.js
index 1661c11315..5eb13a3198 100644
--- a/scripts/system/+android/audio.js
+++ b/scripts/system/+android/audio.js
@@ -15,7 +15,7 @@
 var audiobar;
 var audioButton;
 
-var logEnabled = true;
+var logEnabled = false;
 
 function printd(str) {
     if (logEnabled)
@@ -40,13 +40,15 @@ function init() {
     onMuteToggled();
 
     audioButton.clicked.connect(onMuteClicked);
+    audioButton.entered.connect(onMutePressed);
     Audio.mutedChanged.connect(onMuteToggled);
 }
 
 function onMuteClicked() {
-    printd("On Mute Clicked");
-    //Menu.setIsOptionChecked("Mute Microphone", !Menu.isOptionChecked("Mute Microphone"));
     Audio.muted = !Audio.muted;
+}
+
+function onMutePressed() {
     App.performHapticFeedback("CONTEXT_CLICK");
 }
 
@@ -59,6 +61,7 @@ function onMuteToggled() {
 Script.scriptEnding.connect(function () {
     if(audioButton) {
         audioButton.clicked.disconnect(onMuteClicked);
+        audioButton.entered.disconnect(onMutePressed);
         Audio.mutedChanged.connect(onMuteToggled);
     }
 });
diff --git a/scripts/system/+android/modes.js b/scripts/system/+android/modes.js
index 3743e1d068..c75377b976 100644
--- a/scripts/system/+android/modes.js
+++ b/scripts/system/+android/modes.js
@@ -57,15 +57,22 @@ function init() {
     });
     
     switchToMode(getCurrentModeSetting());
-
-    modeButton.clicked.connect(function() {    
-        App.performHapticFeedback("CONTEXT_CLICK");
-        switchToMode(nextMode[currentMode]);
-    });
+    
+    modeButton.entered.connect(modeButtonPressed);
+    modeButton.clicked.connect(modeButtonClicked);
 }
 
 function shutdown() {
+    modeButton.entered.disconnect(modeButtonPressed);
+    modeButton.clicked.disconnect(modeButtonClicked);
+}
 
+function modeButtonPressed() {
+    App.performHapticFeedback("CONTEXT_CLICK");    
+}
+
+function modeButtonClicked() {
+    switchToMode(nextMode[currentMode]);
 }
 
 function saveCurrentModeSetting(mode) {