Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Commit 42f0595

Browse files
committed
- fix nav drawer
1 parent bfb4d86 commit 42f0595

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

Xamarin.Forms.Platform.Android/Flags.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ internal static class Flags
66
{
77
internal const string UseLegacyRenderers = "UseLegacyRenderers";
88

9-
internal const string AccessibilityExperimental = "AccessibilityExperimental";
9+
internal const string AccessibilityExperimental = "Accessibility_Experimental";
1010

1111
public static bool IsFlagSet(string flagName)
1212
{
@@ -15,7 +15,7 @@ public static bool IsFlagSet(string flagName)
1515

1616
public static bool IsAccessibilityExperimentalSet()
1717
{
18-
return IsFlagSet(nameof(AccessibilityExperimental));
18+
return IsFlagSet(AccessibilityExperimental);
1919
}
2020
}
2121
}

Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs

+12-3
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,11 @@ protected virtual async void UpdateLeftBarButtonItem(Context context, Toolbar to
333333
{
334334
if (_drawerToggle == null && !context.IsDesignerContext())
335335
{
336-
_drawerToggle = new ActionBarDrawerToggle(context.GetActivity(), drawerLayout, toolbar, R.String.Ok, R.String.Ok)
336+
var openId = R.String.Ok;
337+
if (Flags.IsAccessibilityExperimentalSet())
338+
openId = Resource.String.nav_app_bar_open_drawer_description;
339+
340+
_drawerToggle = new ActionBarDrawerToggle(context.GetActivity(), drawerLayout, toolbar, openId, R.String.Ok)
337341
{
338342
ToolbarNavigationClickListener = this,
339343
};
@@ -451,8 +455,13 @@ protected virtual void UpdateToolbarIconAccessibilityText(Toolbar toolbar, Shell
451455
else if (image == null ||
452456
toolbar.SetNavigationContentDescription(image) == null)
453457
{
454-
if(CanNavigateBack && Flags.IsAccessibilityExperimentalSet())
455-
toolbar.SetNavigationContentDescription(Resource.String.nav_app_bar_navigate_up_description);
458+
if (Flags.IsAccessibilityExperimentalSet())
459+
{
460+
if(CanNavigateBack)
461+
toolbar.SetNavigationContentDescription(Resource.String.nav_app_bar_navigate_up_description);
462+
else
463+
toolbar.SetNavigationContentDescription(Resource.String.nav_app_bar_open_drawer_description);
464+
}
456465
else
457466
toolbar.SetNavigationContentDescription(R.String.Ok);
458467
}

0 commit comments

Comments
 (0)