PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '62bb4227da8962642fb9f34161a016c80ab74c0b':
  Hide search from everywhere but the dashboard
This commit is contained in:
Jason Monk
2015-06-03 02:21:00 +00:00
committed by Android Git Automerger
parent 62b92ab53d 62bb4227da
commit 7d9c8b27ef
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/SettingsActivity.java
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);