diff options
author | Jason Monk <jmonk@google.com> | 2015-06-02 16:46:34 -0400 |
---|---|---|
committer | Jason Monk <jmonk@google.com> | 2015-06-02 16:47:56 -0400 |
commit | ea8b1a7dc5fa11742967923251b437a02568f021 (patch) | |
tree | d6c2c1ebd78359b94d4204e1ad21e120423d8660 /src/com/android/settings/SettingsActivity.java | |
parent | 1b7bff11af6eba5e16dc4ef37dd18d4360c0e03f (diff) | |
download | packages_apps_Settings-ea8b1a7dc5fa11742967923251b437a02568f021.zip packages_apps_Settings-ea8b1a7dc5fa11742967923251b437a02568f021.tar.gz packages_apps_Settings-ea8b1a7dc5fa11742967923251b437a02568f021.tar.bz2 |
Hide search from everywhere but the dashboard
Because it is too confusing what it does/doesn't search.
Bug: 21556767
Change-Id: Ib162177ce3eea816344d8d0fd5d71f85bfc94183
Diffstat (limited to 'src/com/android/settings/SettingsActivity.java')
-rw-r--r-- | src/com/android/settings/SettingsActivity.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 25adef1..3cef9ce 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -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); |