diff options
| author | John Spurlock <jspurlock@google.com> | 2014-10-01 14:58:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 14:58:45 +0000 |
| commit | af41d8477a8152c0597630066207a863ad74614e (patch) | |
| tree | 535bd2c6f8e8572a67aafeb8053303259f81b666 /packages | |
| parent | 3022aa2175e82cc67c51a70748ea6923876e9806 (diff) | |
| parent | ee98df79a1797323aaa6d645e9cd5dc6a7cc0ee4 (diff) | |
| download | frameworks_base-af41d8477a8152c0597630066207a863ad74614e.zip frameworks_base-af41d8477a8152c0597630066207a863ad74614e.tar.gz frameworks_base-af41d8477a8152c0597630066207a863ad74614e.tar.bz2 | |
am ee98df79: Doze: Log screenOnFromTouch when flinging.
* commit 'ee98df79a1797323aaa6d645e9cd5dc6a7cc0ee4':
Doze: Log screenOnFromTouch when flinging.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/doze/DozeLog.java | 5 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java b/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java index 34bbc2e..954046c 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java @@ -95,10 +95,11 @@ public class DozeLog { log("dozing " + dozing); } - public static void traceFling(boolean expand, boolean aboveThreshold, boolean thresholdNeeded) { + public static void traceFling(boolean expand, boolean aboveThreshold, boolean thresholdNeeded, + boolean screenOnFromTouch) { if (!ENABLED) return; log("fling expand=" + expand + " aboveThreshold=" + aboveThreshold + " thresholdNeeded=" - + thresholdNeeded); + + thresholdNeeded + " screenOnFromTouch=" + screenOnFromTouch); } public static void traceEmergencyCall() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java index cacc2df..07cef32 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java @@ -337,7 +337,8 @@ public abstract class PanelView extends FrameLayout { boolean expand = flingExpands(vel, vectorVel); onTrackingStopped(expand); DozeLog.traceFling(expand, mTouchAboveFalsingThreshold, - mStatusBar.isFalsingThresholdNeeded()); + mStatusBar.isFalsingThresholdNeeded(), + mStatusBar.isScreenOnComingFromTouch()); fling(vel, expand); mUpdateFlingOnLayout = expand && mPanelClosedOnDown && !mHasLayoutedSinceDown; if (mUpdateFlingOnLayout) { |