[orca] Announce read-only state for checkboxes

[Joanmarie Diggs <joanied src gnome org>]

commit c5866be92b2e5688a9c2d27cc1d9a1b69d5a7e1f
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Thu Aug 13 10:21:09 2020 +0200

    Announce read-only state for checkboxes

 src/orca/formatting.py | 4 ++--
 src/orca/generator.py  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index ae30ed90a..0a101c08a 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -153,8 +153,8 @@ formatting = {
             },
         pyatspi.ROLE_CHECK_BOX: {
             'focused': 'checkedState',
-            'unfocused': 'labelOrName + roleName + checkedState + required + pause + invalid + availability 
+ ' + MNEMONIC + ' + accelerator',
-            'basicWhereAmI': 'namedContainingPanel + labelOrName + roleName + checkedState + ' + MNEMONIC + 
' + accelerator + required + pause + invalid'
+            'unfocused': 'labelOrName + readOnly + roleName + checkedState + required + pause + invalid + 
availability + ' + MNEMONIC + ' + accelerator',
+            'basicWhereAmI': 'namedContainingPanel + labelOrName + readOnly + roleName + checkedState + ' + 
MNEMONIC + ' + accelerator + required + pause + invalid'
             },
         pyatspi.ROLE_CHECK_MENU_ITEM: {
             'focused': 'checkedState',
diff --git a/src/orca/generator.py b/src/orca/generator.py
index c825eb853..c60fd031f 100644
--- a/src/orca/generator.py
+++ b/src/orca/generator.py
@@ -580,7 +580,8 @@ class Generator:
         if not args.get('mode', None):
             args['mode'] = self._mode
         args['stringType'] = 'readonly'
-        if self._script.utilities.isReadOnlyTextArea(obj):
+        if obj.getState().contains(pyatspi.STATE_READ_ONLY) \
+           or self._script.utilities.isReadOnlyTextArea(obj):
             result.append(self._script.formatting.getString(**args))
         return result