From 615f18e987eb83c9dc30417392faf343f90566fe Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Wed, 17 Oct 2018 16:27:41 -0700
Subject: [PATCH] Fix nav-up button in main settings activity.

It should be a non-clickable search icon, not back button. Apparently
the init code must be executed after setActionBar.

Change-Id: Ibbc8aefeebc44562c6105cb51e6f6447a9705ff9
Fixes: 117797520
Test: manual
---
 src/com/android/settings/SettingsActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 9106fe4e5fa..4bf7fac926b 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -296,9 +296,9 @@ public class SettingsActivity extends SettingsBaseActivity
                     deviceProvisioned ? View.VISIBLE : View.INVISIBLE);
             findViewById(R.id.action_bar).setVisibility(View.GONE);
             final Toolbar toolbar = findViewById(R.id.search_action_bar);
+            setActionBar(toolbar);
             FeatureFactory.getFactory(this).getSearchFeatureProvider()
                     .initSearchToolbar(this, toolbar);
-            setActionBar(toolbar);
         }
 
         ActionBar actionBar = getActionBar();