commit 7d9c8b27ef172f8ea242cb9d94d1bfebc1c282e2
author Jason Monk <jmonk@google.com> Wed Jun 03 02:21:00 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 03 02:21:00 2015 +0000
tree 0d488d721255661d8c49c49ff7f209ea66c05575
parent 62b92ab53dd9f7f31d3df5703357477a579e4ef8
parent 62bb4227da8962642fb9f34161a016c80ab74c0b

am 62bb4227: am 6a051168: Merge "Hide search from everywhere but the dashboard" into mnc-dev

* commit '62bb4227da8962642fb9f34161a016c80ab74c0b':
  Hide search from everywhere but the dashboard

src/com/android/settings/SettingsActivity.java

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 @@
                     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);