[orca] Don't insist upon expandable state for presentation of expanded/collapsed

[Joanmarie Diggs <joanied src gnome org>]

commit 8c1124d9d4f5cb72885669a7a4804e715214a762
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Oct 17 11:33:48 2018 +0200

    Don't insist upon expandable state for presentation of expanded/collapsed

 src/orca/generator.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/src/orca/generator.py b/src/orca/generator.py
index 36df1f0f3..c9b4ac809 100644
--- a/src/orca/generator.py
+++ b/src/orca/generator.py
@@ -676,11 +676,13 @@ class Generator:
         args['stringType'] = 'expansion'
         indicators = self._script.formatting.getString(**args)
         state = obj.getState()
-        if state.contains(pyatspi.STATE_EXPANDABLE):
-            if state.contains(pyatspi.STATE_EXPANDED):
-                result.append(indicators[1])
-            else:
-                result.append(indicators[0])
+        if state.contains(pyatspi.STATE_COLLAPSED):
+            result.append(indicators[0])
+        elif state.contains(pyatspi.STATE_EXPANDED):
+            result.append(indicators[1])
+        elif state.contains(pyatspi.STATE_EXPANDABLE):
+            result.append(indicators[0])
+
         return result
 
     def _generateMultiselectableState(self, obj, **args):