Merge "Fix nav-up button in main settings activity."

2018-10-18 03:22:32 +00:00
parent d06cb5803f 615f18e987
commit 326a4cd219
1 changed files with 1 additions and 1 deletions
--- 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();