[orca] Only speak layered pane role if there is no label or name

[Joanmarie Diggs <joanied src gnome org>]

commit dd597f493e310addf82061695a7f86d961ff8654
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed May 16 11:22:38 2018 -0400

    Only speak layered pane role if there is no label or name

 src/orca/formatting.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index 3da28ea..34fd061 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -258,10 +258,10 @@ formatting = {
             'unfocused': '((substring and currentLineText) or labelAndName) + roleName + pause + 
unrelatedLabels'
             },
         pyatspi.ROLE_LAYERED_PANE: {
-            'focused': 'labelAndName + roleName + availability + noShowingChildren',
-            'unfocused': 'labelAndName + roleName + availability + noShowingChildren',
-            'basicWhereAmI': 'labelAndName + pause + roleName + pause + selectedItemCount + pause',
-            'detailedWhereAmI': 'labelAndName + pause + roleName + pause + selectedItemCount + pause + 
selectedItems + pause'
+            'focused': '(labelAndName or roleName) + availability + noShowingChildren',
+            'unfocused': '(labelAndName or roleName) + availability + noShowingChildren',
+            'basicWhereAmI': '(labelAndName or roleName) + pause + selectedItemCount + pause',
+            'detailedWhereAmI': '(labelAndName or roleName) + pause + roleName + pause + selectedItemCount + 
pause + selectedItems + pause'
             },
         pyatspi.ROLE_LINK: {
             'unfocused': '(name or displayedText) + roleName + pause + expandableState + availability + ' + 
MNEMONIC,