From 1ecdea5db3abcf04f01514558c36ed2fb92a2d79 Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Tue, 9 Jun 2020 12:10:40 -0300
Subject: [PATCH] Reinstate highlighter under drawing menu.

---
 .../org/thoughtcrime/securesms/scribbles/ImageEditorHud.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
index 69abd2a09db..014eb9b7f3c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
@@ -123,9 +123,9 @@ private void updateCropAspectLockImage(boolean cropAspectLocked) {
   private void initializeVisibilityMap() {
     setVisibleViewsWhenInMode(Mode.NONE, drawButton, blurButton, textButton, stickerButton, cropButton, undoButton, saveButton);
 
-    setVisibleViewsWhenInMode(Mode.DRAW, confirmButton, undoButton, colorPicker, colorPalette);
+    setVisibleViewsWhenInMode(Mode.DRAW, confirmButton, undoButton, colorPicker, colorPalette, highlightButton);
 
-    setVisibleViewsWhenInMode(Mode.HIGHLIGHT, confirmButton, undoButton, colorPicker, colorPalette);
+    setVisibleViewsWhenInMode(Mode.HIGHLIGHT, confirmButton, undoButton, colorPicker, colorPalette, drawButton);
 
     setVisibleViewsWhenInMode(Mode.BLUR, confirmButton, undoButton, blurToggleHud);