Merge "Hide search from everywhere but the dashboard" into mnc-dev (6a051168) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsActivity.java

+2 −5

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