- fix nav drawer

xamarin · Jun 8, 2021 · 42f0595 · 42f0595
1 parent bfb4d86
commit 42f0595
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/Xamarin.Forms.Platform.Android/Flags.cs b/Xamarin.Forms.Platform.Android/Flags.cs
@@ -6,7 +6,7 @@ internal static class Flags
 	{
 		internal const string UseLegacyRenderers = "UseLegacyRenderers";
 
-		internal const string AccessibilityExperimental = "AccessibilityExperimental";
+		internal const string AccessibilityExperimental = "Accessibility_Experimental";
 
 		public static bool IsFlagSet(string flagName)
 		{
@@ -15,7 +15,7 @@ public static bool IsFlagSet(string flagName)
 
 		public static bool IsAccessibilityExperimentalSet()
 		{
-			return IsFlagSet(nameof(AccessibilityExperimental));
+			return IsFlagSet(AccessibilityExperimental);
 		}
 	}
 }
diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs b/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs
@@ -333,7 +333,11 @@ protected virtual async void UpdateLeftBarButtonItem(Context context, Toolbar to
 		{
 			if (_drawerToggle == null && !context.IsDesignerContext())
 			{
-				_drawerToggle = new ActionBarDrawerToggle(context.GetActivity(), drawerLayout, toolbar, R.String.Ok, R.String.Ok)
+				var openId = R.String.Ok;
+				if (Flags.IsAccessibilityExperimentalSet())
+					openId = Resource.String.nav_app_bar_open_drawer_description;
+
+				_drawerToggle = new ActionBarDrawerToggle(context.GetActivity(), drawerLayout, toolbar, openId, R.String.Ok)
 				{
 					ToolbarNavigationClickListener = this,
 				};
@@ -451,8 +455,13 @@ protected virtual void UpdateToolbarIconAccessibilityText(Toolbar toolbar, Shell
 			else if (image == null ||
 				toolbar.SetNavigationContentDescription(image) == null)
 			{
-				if(CanNavigateBack && Flags.IsAccessibilityExperimentalSet())
-					toolbar.SetNavigationContentDescription(Resource.String.nav_app_bar_navigate_up_description);
+				if (Flags.IsAccessibilityExperimentalSet())
+				{
+					if(CanNavigateBack)
+						toolbar.SetNavigationContentDescription(Resource.String.nav_app_bar_navigate_up_description);
+					else
+						toolbar.SetNavigationContentDescription(Resource.String.nav_app_bar_open_drawer_description);
+				}
 				else
 					toolbar.SetNavigationContentDescription(R.String.Ok);
 			}