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

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

Browse Source 
* commit '6a05116804c9b849bf3aa634df3e90cc216abc88':
  Hide search from everywhere but the dashboard
This commit is contained in:
Jason Monk
2015-06-02 22:48:49 +00:00
committed by Android Git Automerger
parent 63a885d39f 6a05116804
commit 62bb4227da
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 */);
} 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);