Merge "Pressure info in captured gestures."

dsandler · Android (Google) Code Review · commit 9ba15a93615b · 2012-07-24T10:09:08.000-07:00
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java b/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java
@@ -63,11 +63,15 @@ String actionName(int action) {
                 }
             }
             public String toJson() {
-                return String.format("{\"type\":\"motion\", \"time\":%d, \"action\":\"%s\", \"x\":%.2f, \"y\":%.2f}",
+                return String.format(
+                        ("{\"type\":\"motion\", \"time\":%d, \"action\":\"%s\", "
+                            + "\"x\":%.2f, \"y\":%.2f, \"s\":%.2f, \"p\":%.2f}"),
                         this.time,
                         actionName(this.event.getAction()),
                         this.event.getRawX(),
-                        this.event.getRawY()
+                        this.event.getRawY(),
+                        this.event.getSize(),
+                        this.event.getPressure()
                         );
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -63,11 +63,15 @@ String actionName(int action) {`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`public String toJson() {`
`66`		`- return String.format("{\"type\":\"motion\", \"time\":%d, \"action\":\"%s\", \"x\":%.2f, \"y\":%.2f}",`
	`66`	`+ return String.format(`
	`67`	`+ ("{\"type\":\"motion\", \"time\":%d, \"action\":\"%s\", "`
	`68`	`+ + "\"x\":%.2f, \"y\":%.2f, \"s\":%.2f, \"p\":%.2f}"),`
`67`	`69`	`this.time,`
`68`	`70`	`actionName(this.event.getAction()),`
`69`	`71`	`this.event.getRawX(),`
`70`		`- this.event.getRawY()`
	`72`	`+ this.event.getRawY(),`
	`73`	`+ this.event.getSize(),`
	`74`	`+ this.event.getPressure()`
`71`	`75`	`);`
`72`	`76`	`}`
`73`	`77`	`}`