summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-09-12 15:36:18 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-12 15:36:18 -0700
commit0aae7c2d51f369e0f45bc9e1f05cac34ecf9c864 (patch)
tree7990003762396315b0afb213eb9fc3a6f8676e34 /src
parent15f4ed021e219da5375a2b0d406175f08a590026 (diff)
parentbb3a4f2a57b137a62f2cc2dc8acf51a17e62dd74 (diff)
downloadpackages_apps_Browser-0aae7c2d51f369e0f45bc9e1f05cac34ecf9c864.zip
packages_apps_Browser-0aae7c2d51f369e0f45bc9e1f05cac34ecf9c864.tar.gz
packages_apps_Browser-0aae7c2d51f369e0f45bc9e1f05cac34ecf9c864.tar.bz2
Merge "Use uptimeMillis instead of currentTimeMillis"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/UrlBarAutoShowManager.java5
1 files changed, 3 insertions, 2 deletions
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 @@ public class UrlBarAutoShowManager implements OnTouchListener,
@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 @@ public class UrlBarAutoShowManager implements OnTouchListener,
if (dy > mSlop && angle > V_TRIGGER_ANGLE
&& !mUi.isTitleBarShowing()
&& web.getVisibleTitleHeight() == 0) {
- mTriggeredTime = System.currentTimeMillis();
+ mTriggeredTime = SystemClock.uptimeMillis();
mUi.showTitleBar();
}
}