Android: Replace toolbar Back button with Close Tab

These should be user-configurable, though.

1 files changed, 9 insertions, 0 deletions

diff --git a/src/ui/root.c b/src/ui/root.c
index 36ac948e..3e0124d8 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -1542,10 +1542,19 @@ void createUserInterface_Root(iRoot *d) {
                                      arrangeHeight_WidgetFlag | arrangeHorizontal_WidgetFlag |
                                      commandOnClick_WidgetFlag |
                                      drawBackgroundToBottom_WidgetFlag, iTrue);
+#if defined (iPlatformAndroidMobile)
+        /* Android has a system-provided back button (or gesture?), or in the toolbar we can have
+           a different in the place of Back. */
+        setId_Widget(addChildFlags_Widget(toolBar,
+                                          iClob(newLargeIcon_LabelWidget(close_Icon, "tabs.close")),
+                                          frameless_WidgetFlag),
+                     "toolbar.close");
+#else
         setId_Widget(addChildFlags_Widget(toolBar,
                                           iClob(newLargeIcon_LabelWidget(backArrow_Icon, "navigate.back")),
                                           frameless_WidgetFlag),
                      "toolbar.back");
+#endif
         setId_Widget(addChildFlags_Widget(toolBar,
                                           iClob(newLargeIcon_LabelWidget(forwardArrow_Icon, "navigate.forward")),
                                           frameless_WidgetFlag),