commit 61353aa4fd4fd6d3fb5561ff1a2511b029d98137
author Andrew Sapperstein <asapperstein@google.com> Tue Jun 06 16:33:13 2017 +0000
committer Andrew Sapperstein <asapperstein@google.com> Tue Jun 06 17:29:41 2017 +0000
tree 0d868b4d14d81eb14aee5d6355d04c45e6ea196f
parent fac61b71e5b32bf8cd464049c2750a18911b75b2

Revert "Add search bar to SearchActivity."

This reverts commit fac61b71e5b32bf8cd464049c2750a18911b75b2.

Bug: 37477506
Change-Id: I1ee66999fbb28b03feb5a51c7146f31a71c1252a
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cc27223..b9c0f9f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -212,8 +212,7 @@
         <activity android:name=".search2.SearchActivity"
                   android:label="@string/search_settings"
                   android:icon="@drawable/ic_search_history"
-                  android:parentActivityName="Settings"
-                  android:theme="@style/Theme.Settings.NoActionBar">
+                  android:parentActivityName="Settings">
         </activity>
 
         <!-- Top-level settings -->