Merge "Add touch disabled state output in dumpsys" into lmp-dev

This commit is contained in:
Jorim Jaggi
2014-09-12 19:57:25 +00:00
committed by Android (Google) Code Review

View File

@@ -966,7 +966,7 @@ public abstract class PanelView extends FrameLayout {
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
pw.println(String.format("[PanelView(%s): expandedHeight=%f maxPanelHeight=%d closing=%s"
+ " tracking=%s justPeeked=%s peekAnim=%s%s timeAnim=%s%s"
+ " tracking=%s justPeeked=%s peekAnim=%s%s timeAnim=%s%s touchDisabled=%s"
+ "]",
this.getClass().getSimpleName(),
getExpandedHeight(),
@@ -975,7 +975,8 @@ public abstract class PanelView extends FrameLayout {
mTracking?"T":"f",
mJustPeeked?"T":"f",
mPeekAnimator, ((mPeekAnimator!=null && mPeekAnimator.isStarted())?" (started)":""),
mHeightAnimator, ((mHeightAnimator !=null && mHeightAnimator.isStarted())?" (started)":"")
mHeightAnimator, ((mHeightAnimator !=null && mHeightAnimator.isStarted())?" (started)":""),
mTouchDisabled?"T":"f"
));
}