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
This commit is contained in:
Fan Zhang
2018-10-17 16:27:41 -07:00
parent cb6b34e893
commit 615f18e987

View File

@@ -296,9 +296,9 @@ public class SettingsActivity extends SettingsBaseActivity
deviceProvisioned ? View.VISIBLE : View.INVISIBLE); deviceProvisioned ? View.VISIBLE : View.INVISIBLE);
findViewById(R.id.action_bar).setVisibility(View.GONE); findViewById(R.id.action_bar).setVisibility(View.GONE);
final Toolbar toolbar = findViewById(R.id.search_action_bar); final Toolbar toolbar = findViewById(R.id.search_action_bar);
setActionBar(toolbar);
FeatureFactory.getFactory(this).getSearchFeatureProvider() FeatureFactory.getFactory(this).getSearchFeatureProvider()
.initSearchToolbar(this, toolbar); .initSearchToolbar(this, toolbar);
setActionBar(toolbar);
} }
ActionBar actionBar = getActionBar(); ActionBar actionBar = getActionBar();