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
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 9106fe4..4bf7fac 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -296,9 +296,9 @@
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();