Restore the 3-dot menu when creating a PIN.

app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinFragment.java

@@ -17,6 +17,8 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 
 import org.thoughtcrime.securesms.LoggingFragment;
 import org.thoughtcrime.securesms.R;
@@ -73,6 +75,10 @@ public abstract class BaseKbsPinFragment<ViewModel extends BaseKbsPinViewModel>
       CommunicationActions.openBrowserLink(requireContext(), getString(R.string.BaseKbsPinFragment__learn_more_url));
     });
 
+    Toolbar toolbar = view.findViewById(R.id.kbs_pin_toolbar);
+    ((AppCompatActivity) requireActivity()).setSupportActionBar(toolbar);
+    ((AppCompatActivity) requireActivity()).getSupportActionBar().setTitle(null);
+
     initializeListeners();
   }
 
@@ -100,17 +106,16 @@ public abstract class BaseKbsPinFragment<ViewModel extends BaseKbsPinViewModel>
 
   @Override
   public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-    switch (item.getItemId()) {
-      case R.id.menu_pin_learn_more:
+    if (item.getItemId() == R.id.menu_pin_learn_more) {
       onLearnMore();
       return true;
-      case R.id.menu_pin_skip:
+    } else if (item.getItemId() == R.id.menu_pin_skip) {
       onPinSkipped();
       return true;
-    }
-
+    } else {
       return false;
     }
+  }
 
   protected abstract ViewModel initializeViewModel();
 

app/src/main/res/layout/base_kbs_pin_fragment.xml

@@ -12,17 +12,24 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/kbs_pin_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toStartOf="parent" />
+
         <TextView
             android:id="@+id/edit_kbs_pin_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
-            android:layout_marginTop="32dp"
+            android:layout_marginTop="0dp"
             android:layout_marginEnd="24dp"
             android:textAppearance="@style/Signal.Text.HeadlineMedium"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/kbs_pin_toolbar"
             tools:text="@string/CreateKbsPinFragment__create_your_pin" />
 
         <org.thoughtcrime.securesms.util.views.LearnMoreTextView