diff options
| author | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-01-29 22:10:33 -0800 |
|---|---|---|
| committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-01-29 22:25:36 -0800 |
| commit | dc6e2bafb333b4c0d6311d9c225374f403d105c5 (patch) | |
| tree | 06f4dac7d4341476f4ab5e324d0f411a3c327bbb | |
| parent | d5ef809446188f0488c797f4cc53db4f02af4d98 (diff) | |
| download | android_packages_apps_Trebuchet-dc6e2bafb333b4c0d6311d9c225374f403d105c5.tar.gz android_packages_apps_Trebuchet-dc6e2bafb333b4c0d6311d9c225374f403d105c5.tar.bz2 android_packages_apps_Trebuchet-dc6e2bafb333b4c0d6311d9c225374f403d105c5.zip | |
Fix invisible voice search
When 'show search bar' is disabled, you can still tap the voice
search icon's position (even though view == gone) to launch search
action.
Partial fix borrowed from 10.2 http://review.cyanogenmod.org/#/c/21584
PS2: Use available variables instead of changing one to protected
PS3: Fix mis-paste
Change-Id: I268d0e1108992028fd324d42e7dc8b6e11c757eb
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 0073b4ca4..b07943019 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3600,7 +3600,7 @@ public class Launcher extends Activity final SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE); ComponentName activityName = searchManager.getGlobalSearchActivity(); - if (activityName != null) { + if (activityName != null && mWorkspace.shouldVoiceButtonProxyBeVisible()) { int coi = getCurrentOrientationIndexForGlobalIcons(); sGlobalSearchIcon[coi] = updateButtonWithIconFromExternalActivity( R.id.search_button, activityName, R.drawable.ic_home_search_normal_holo, diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 60abea4a6..ce7488b95 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2007,7 +2007,7 @@ public class Workspace extends SmoothPagedView if (mState != State.NORMAL) { return false; } - return true; + return mShowSearchBar; } public void updateInteractionForState() { |