commit 408c6a3e8702dc7ac7919a8a5f7cc08bbfd194bd
author Fan Zhang <zhfan@google.com> Mon Jan 09 16:24:01 2017 -0800
committer Fan Zhang <zhfan@google.com> Mon Jan 09 16:39:25 2017 -0800
tree d1c1687f737aa158c96dab369c86c3c52d2d00a3
parent c4372f1a481899bbb2fbfb557028859b7287268e

Set parent activity for search.

This enables the nav up button from actionbar.

Fix: 34176247
Test:  runtest --path packages/apps/Settings/tests/unit/src/com/android/settings/search/SearchActivityTest.java

Change-Id: I28ef9f1270f5a178346ff9bd9148f7f2035858b2

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5aacb0a..776c4ec 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -218,7 +218,8 @@
 
         <activity android:name=".search2.SearchActivity"
                   android:label="@string/search_settings"
-                  android:icon="@drawable/ic_search_history">
+                  android:icon="@drawable/ic_search_history"
+                  android:parentActivityName="Settings">
         </activity>
 
         <!-- Top-level settings -->