[orca] Ensure we speak selected switcher item even when onlySpeakDisplayedText is set

[Joanmarie Diggs <joanied src gnome org>]

commit 491ca418cfc54536fb5fd5469c6a392eb55e87f3
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri Nov 15 10:05:18 2019 -0500

    Ensure we speak selected switcher item even when onlySpeakDisplayedText is set

 src/orca/scripts/default.py         | 8 ++++----
 src/orca/scripts/switcher/script.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index 560341316..9528ce356 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -3812,7 +3812,7 @@ class Script(script.Script):
         speech.speakKeyEvent(event, voice)
         return True
 
-    def presentMessage(self, fullMessage, briefMessage=None, voice=None, resetStyles=True):
+    def presentMessage(self, fullMessage, briefMessage=None, voice=None, resetStyles=True, force=False):
         """Convenience method to speak a message and 'flash' it in braille.
 
         Arguments:
@@ -3840,7 +3840,7 @@ class Script(script.Script):
             else:
                 message = fullMessage
             if message:
-                self.speakMessage(message, voice=voice, resetStyles=resetStyles)
+                self.speakMessage(message, voice=voice, resetStyles=resetStyles, force=force)
 
         if (_settingsManager.getSetting('enableBraille') \
              or _settingsManager.getSetting('enableBrailleMonitor')) \
@@ -4229,7 +4229,7 @@ class Script(script.Script):
         voice = self.speechGenerator.voice(string=character)
         speech.speakCharacter(character, voice)
 
-    def speakMessage(self, string, voice=None, interrupt=True, resetStyles=True):
+    def speakMessage(self, string, voice=None, interrupt=True, resetStyles=True, force=False):
         """Method to speak a single string. Scripts should use this
         method rather than calling speech.speak directly.
 
@@ -4241,7 +4241,7 @@ class Script(script.Script):
         """
 
         if not _settingsManager.getSetting('enableSpeech') \
-           or _settingsManager.getSetting('onlySpeakDisplayedText'):
+           or (_settingsManager.getSetting('onlySpeakDisplayedText') and not force):
             return
 
         voices = _settingsManager.getSetting('voices')
diff --git a/src/orca/scripts/switcher/script.py b/src/orca/scripts/switcher/script.py
index 51654ca97..b60d87fa0 100644
--- a/src/orca/scripts/switcher/script.py
+++ b/src/orca/scripts/switcher/script.py
@@ -73,7 +73,7 @@ class Script(default.Script):
         self.presentationInterrupt()
         orca_state.activeWindow = self.utilities.topLevelObject(event.source)
         orca.setLocusOfFocus(event, event.source, False)
-        self.presentMessage(self.utilities.getSelectionName(event.source))
+        self.presentMessage(self.utilities.getSelectionName(event.source), force=True)
         return True
 
     def onFocusedChanged(self, event):