Merge branch 'mkirk/search-icon'

Signal/Images.xcassets/conversation_settings_search.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "search-24@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "search-24@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "search-24@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m

@@ -363,7 +363,7 @@ const CGFloat kIconViewLength = 24;
                                      @"Table cell label in conversation settings which returns the user to the "
                                      @"conversation with 'search mode' activated");
                                  return
-                                     [weakSelf disclosureCellWithName:title iconName:@"actionsheet_camera_roll_black"];
+                                     [weakSelf disclosureCellWithName:title iconName:@"conversation_settings_search"];
                              }
                              actionBlock:^{
                                  [weakSelf tappedConversationSearch];

SignalMessaging/Views/OWSNavigationBar.swift

@@ -62,7 +62,6 @@ public class OWSNavigationBar: UINavigationBar {
 
     override public var next: UIResponder? {
         if let stubbedNextResponder = self.stubbedNextResponder {
-            Logger.debug("returning stubbed responder")
             return stubbedNextResponder
         }