From 5559ac346aaa66ba7d5ab95be83da9ec9f8db7c1 Mon Sep 17 00:00:00 2001 From: Margaret Leibovic Date: Fri, 13 Jun 2014 13:56:47 -0700 Subject: [PATCH] backout 578bf8d6363c for causing robocop pan regression --- mobile/android/base/BrowserApp.java | 10 ++-------- mobile/android/base/widget/ButtonToast.java | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java index ff9c11ebdb30..68867ecdf675 100644 --- a/mobile/android/base/BrowserApp.java +++ b/mobile/android/base/BrowserApp.java @@ -487,7 +487,7 @@ abstract public class BrowserApp extends GeckoApp Telemetry.sendUIEvent(TelemetryContract.Event.LOAD_URL, TelemetryContract.Method.INTENT); } - ((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideOnTouchListener()); + ((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideTabsTouchListener()); ((GeckoApp.MainLayout) mMainLayout).setMotionEventInterceptor(new MotionEventInterceptor() { @Override public boolean onInterceptMotionEvent(View view, MotionEvent event) { @@ -1985,17 +1985,11 @@ abstract public class BrowserApp extends GeckoApp mBrowserSearch.setUserVisibleHint(false); } - /** - * Hides certain UI elements (e.g. button toast, tabs tray) when the - * user touches the main layout. - */ - private class HideOnTouchListener implements TouchEventInterceptor { + private class HideTabsTouchListener implements TouchEventInterceptor { private boolean mIsHidingTabs = false; @Override public boolean onInterceptTouchEvent(View view, MotionEvent event) { - getButtonToast().hide(false, ButtonToast.ReasonHidden.TOUCH_OUTSIDE); - // We need to account for scroll state for the touched view otherwise // tapping on an "empty" part of the view will still be considered a // valid touch event. diff --git a/mobile/android/base/widget/ButtonToast.java b/mobile/android/base/widget/ButtonToast.java index 7475ceb74469..05f258eaa750 100644 --- a/mobile/android/base/widget/ButtonToast.java +++ b/mobile/android/base/widget/ButtonToast.java @@ -42,7 +42,6 @@ public class ButtonToast { public enum ReasonHidden { CLICKED, - TOUCH_OUTSIDE, TIMEOUT, REPLACED, STARTUP