Windows 8 start screen: make sure to still announce the name of a gro…

…up if it has a custom label.

source/appModules/explorer.py

@@ -4,6 +4,7 @@
 #This file is covered by the GNU General Public License.
 #See the file COPYING for more details.
 
+from comtypes import COMError
 import time
 import appModuleHandler
 import controlTypes
@@ -99,12 +100,21 @@ class GridListTileElement(UIA):
 	class GridGroup(UIA):
 		"""A group in the Windows 8 Start Menu.
 		"""
-		# The name is determined from the first child, but this has no relevance.
-		name = None
-		#But the grouping is still important content
 		presentationType=UIA.presType_content
 
-	class ImmersiveLauncher(UIA):
+		#Normally the name is the first tile which is rather redundant
+		#However some groups have custom header text which should be read instead
+		def _get_name(self):
+			child=self.firstChild
+			if isinstance(child,UIA):
+				try:
+					automationID=child.UIAElement.currentAutomationID
+				except COMError:
+					automationID=None
+				if automationID=="GridListGroupHeader":
+					return child.name
+
+class ImmersiveLauncher(UIA):
 		#When the win8 start screen openes, focus correctly goes to the first tile, but then incorrectly back to the root of the window.
 		#Ignore focus events on this object.
 		shouldAllowUIAFocusEvent=False

user_docs/en/changes.t2t

@@ -95,7 +95,7 @@ Highlights of this release include support for Asian character input; experiment
 - UI Automation text controls (e.g.  the search field in the Windows 7 Start Menu) are now  correctly announced when moving the mouse over them rather than staying silent.
 - Keyboard layout changes are no longer reported during say all, which was particularly problematic for multilingual documents including Arabic text. (#1676)
 - The entire content of some UI Automation editable text controls (e.g. the Search Box in the Windows 7/8 Start Menu) is no longer announced every time it changes.
-- When moving between groups on the Windows 8 start screen, the first tile's name will no longer be reported as the group's name, which can speed up navigation. (#2658)
+- When moving between groups on the Windows 8 start screen, unlabeled groups no longer announce their first tile as the name of the group. (#2658)
 - When opening the Windows 8 start screen, the focus is correctly placed on the first tile, rather than jumping to the root of the start screen which can confuse navigation. (#2720)
 - NVDA will no longer fail to start when the user's profile path contains certain multibyte characters. (#2729)
 - In browse mode in Google Chrome, the text of tabs is now rendered correctly.