Merge "Fix nav-up button in main settings activity."
This commit is contained in:
committed by
Android (Google) Code Review
commit
326a4cd219
@@ -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();
|
||||||
|
|||||||
Reference in New Issue
Block a user