commit 680410646329ced74ec31bdf6355f6a36a95ba48
author John Reck <jreck@google.com> Mon Sep 12 17:16:06 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 12 17:16:06 2011 -0700
tree e97744e1fc6545ee17dcba07518949436adfc9a0
parent 0aae7c2d51f369e0f45bc9e1f05cac34ecf9c864
parent 4eb475de8265a4d177580a137a6a7148aaec1380

Merge "Add sanity checking to bookmark click listener"

src/com/android/browser/UrlBarAutoShowManager.java

diff --git a/src/com/android/browser/UrlBarAutoShowManager.java b/src/com/android/browser/UrlBarAutoShowManager.java
index 0db31ff..b491e0b 100644
--- a/src/com/android/browser/UrlBarAutoShowManager.java
+++ b/src/com/android/browser/UrlBarAutoShowManager.java
@@ -15,6 +15,7 @@
  */
 package com.android.browser;
 
+import android.os.SystemClock;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnTouchListener;
@@ -68,7 +69,7 @@
 
     @Override
     public void onScrollChanged(int l, int t, int oldl, int oldt) {
-        mLastScrollTime = System.currentTimeMillis();
+        mLastScrollTime = SystemClock.uptimeMillis();
         if (t != oldt) {
             if (t != 0) {
                 // If it is showing, extend it
@@ -124,7 +125,7 @@
                     if (dy > mSlop && angle > V_TRIGGER_ANGLE
                             && !mUi.isTitleBarShowing()
                             && web.getVisibleTitleHeight() == 0) {
-                        mTriggeredTime = System.currentTimeMillis();
+                        mTriggeredTime = SystemClock.uptimeMillis();
                         mUi.showTitleBar();
                     }
                 }