summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-11-06 10:12:54 -0800
committerDanesh M <daneshm90@gmail.com>2015-09-27 20:46:52 -0700
commit5b54994fc56c9d00d415f161457c2c7449af912d (patch)
treef78f60595d88ca965a5ffc526fcee478026adbf4 /src/com/android/launcher3/Workspace.java
parent4ca61d13bc2fd0faa18ce76b1f9edf00323ce260 (diff)
downloadandroid_packages_apps_Trebuchet-5b54994fc56c9d00d415f161457c2c7449af912d.tar.gz
android_packages_apps_Trebuchet-5b54994fc56c9d00d415f161457c2c7449af912d.tar.bz2
android_packages_apps_Trebuchet-5b54994fc56c9d00d415f161457c2c7449af912d.zip
Using the default search widget in Launcher3
> Removing all logic related to search and voice overlays from Launcher3 > Using the widget provided by global search provider on the homescreen > Removing VoiceButtonProxy, as it is not being used anymore Change-Id: Ie8b09b44f7213c8fa11bce685914442e4884295d
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index aa919b307..96be50235 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1364,13 +1364,11 @@ public class Workspace extends SmoothPagedView
if (mCustomContentCallbacks != null) {
mCustomContentCallbacks.onShow(false);
mCustomContentShowTime = System.currentTimeMillis();
- mLauncher.updateVoiceButtonProxyVisible(false);
}
} else if (hasCustomContent() && getNextPage() != 0 && mCustomContentShowing) {
mCustomContentShowing = false;
if (mCustomContentCallbacks != null) {
mCustomContentCallbacks.onHide();
- mLauncher.updateVoiceButtonProxyVisible(false);
}
}
}
@@ -2301,16 +2299,6 @@ public class Workspace extends SmoothPagedView
return scale;
}
- boolean shouldVoiceButtonProxyBeVisible() {
- if (isOnOrMovingToCustomContent()) {
- return false;
- }
- if (mState != State.NORMAL) {
- return false;
- }
- return mShowSearchBar;
- }
-
public void updateInteractionForState() {
if (mState != State.NORMAL) {
mLauncher.onInteractionBegin();
@@ -2658,7 +2646,6 @@ public class Workspace extends SmoothPagedView
setScaleY(mNewScale);
setTranslationY(finalWorkspaceTranslationY);
}
- mLauncher.updateVoiceButtonProxyVisible(false);
if (stateIsNormal || stateIsNormalHidden) {
animateBackgroundGradient(0f, animated);