Refine output of containers when focused

chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js

Index: chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js b/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
index a352f0ec193ea2a722b1bb25c54eed393c48d8e2..2a6d21ee1706a6c3b716d915ca8703bf978cb959 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
@@ -421,7 +421,7 @@ Output.RULES = {
     },
     abstractContainer: {
       enter: '$nameFromNode $role $state $description',
-      speak: '$descendants $name $value $state $role $description',
+      speak: '$name $value $state $role $description',
       leave: '@exited_container($role)'
     },
     alert: {
@@ -457,7 +457,7 @@ Output.RULES = {
     },
     group: {
       enter: '$nameFromNode $state $description',
-      speak: '$descendants $name $value $state $description',
+      speak: '$nameOrDescendants $value $state $description',
       leave: ''
     },
     heading: {
@@ -1435,6 +1435,7 @@ Output.prototype = {
          i++) {
       // This prevents very repetitive announcements.
       if (enteredRoleSet[formatPrevNode.role] ||
+          node.role == formatPrevNode.role ||
           localStorage['useVerboseMode'] == 'false')
         continue;