diff options
author | John Reck <jreck@google.com> | 2011-11-15 13:07:12 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-15 13:07:12 -0800 |
commit | 86e099843c5edbba003c00e6eb44c1b65065b6d9 (patch) | |
tree | 8c026255fa5248456160f60dc0f524cf7d785ded /src | |
parent | 6599f0e2fefd08be0294f121667d3809fff5e2af (diff) | |
parent | bb0b166023502a3d5f68e166c7d009e6921b2417 (diff) | |
download | packages_apps_browser-86e099843c5edbba003c00e6eb44c1b65065b6d9.zip packages_apps_browser-86e099843c5edbba003c00e6eb44c1b65065b6d9.tar.gz packages_apps_browser-86e099843c5edbba003c00e6eb44c1b65065b6d9.tar.bz2 |
am bb0b1660: Merge "Remove old != new onScrollChanged check" into ics-mr1
* commit 'bb0b166023502a3d5f68e166c7d009e6921b2417':
Remove old != new onScrollChanged check
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/browser/UrlBarAutoShowManager.java | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/com/android/browser/UrlBarAutoShowManager.java b/src/com/android/browser/UrlBarAutoShowManager.java index 294115e..9f7827b 100644 --- a/src/com/android/browser/UrlBarAutoShowManager.java +++ b/src/com/android/browser/UrlBarAutoShowManager.java @@ -71,19 +71,17 @@ public class UrlBarAutoShowManager implements OnTouchListener, @Override public void onScrollChanged(int l, int t, int oldl, int oldt) { mLastScrollTime = SystemClock.uptimeMillis(); - if (t != oldt) { - mIsScrolling = true; - if (t != 0) { - // If it is showing, extend it - if (mUi.isTitleBarShowing()) { - long remaining = mLastScrollTime - mTriggeredTime; - remaining = Math.max(BaseUi.HIDE_TITLEBAR_DELAY - remaining, - SCROLL_TIMEOUT_DURATION); - mUi.showTitleBarForDuration(remaining); - } - } else { - mUi.suggestHideTitleBar(); + mIsScrolling = true; + if (t != 0) { + // If it is showing, extend it + if (mUi.isTitleBarShowing()) { + long remaining = mLastScrollTime - mTriggeredTime; + remaining = Math.max(BaseUi.HIDE_TITLEBAR_DELAY - remaining, + SCROLL_TIMEOUT_DURATION); + mUi.showTitleBarForDuration(remaining); } + } else { + mUi.suggestHideTitleBar(); } } |