Hide search from everywhere but the dashboard

Because it is too confusing what it does/doesn't search.

Bug: 21556767
Change-Id: Ib162177ce3eea816344d8d0fd5d71f85bfc94183
This commit is contained in:
Jason Monk
2015-06-02 16:46:34 -04:00
parent 1b7bff11af
commit ea8b1a7dc5

View File

@@ -607,17 +607,14 @@ public class SettingsActivity extends Activity
1 /* one home activity by default */); 1 /* one home activity by default */);
} else { } else {
if (!mIsShowingDashboard) { if (!mIsShowingDashboard) {
// Search is shown we are launched thru a Settings "shortcut". UP will be shown mDisplaySearch = false;
// only if it is a sub settings // UP will be shown only if it is a sub settings
if (mIsShortcut) { if (mIsShortcut) {
mDisplayHomeAsUpEnabled = isSubSettings; mDisplayHomeAsUpEnabled = isSubSettings;
mDisplaySearch = false;
} else if (isSubSettings) { } else if (isSubSettings) {
mDisplayHomeAsUpEnabled = true; mDisplayHomeAsUpEnabled = true;
mDisplaySearch = true;
} else { } else {
mDisplayHomeAsUpEnabled = false; mDisplayHomeAsUpEnabled = false;
mDisplaySearch = false;
} }
setTitleFromIntent(intent); setTitleFromIntent(intent);