diff options
| author | 2014-09-30 09:56:05 -0400 | |
|---|---|---|
| committer | 2014-09-30 14:07:23 +0000 | |
| commit | ee98df79a1797323aaa6d645e9cd5dc6a7cc0ee4 (patch) | |
| tree | b05c75dab22cd2fb3df9371601ed0b18ed80c46c | |
| parent | bc156ba430d286aaab8deb7bbb3bccc655cd2e92 (diff) | |
Doze: Log screenOnFromTouch when flinging.
Bug: 17350239
Bug: 17496795
Change-Id: I4a8e26c2fc05cf4396e9c8cb58e81b4f95c531e6
| -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 34bbc2e9c469..954046c67d87 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 cacc2df7843e..07cef3215931 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) { |