am cd1f309: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev

sganov · Android Git Automerger · commit 0e538548d75b · 2012-11-08T13:07:29.000-08:00
* commit 'cd1f3095056bd4148030f6f6c514387d623db800':
  Slide unlock cannot get accessibility focus.
diff --git a/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java b/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
@@ -954,7 +954,8 @@ public boolean onHoverEvent(MotionEvent event) {
             onTouchEvent(event);
             event.setAction(action);
         }
-        return super.onHoverEvent(event);
+        super.onHoverEvent(event);
+        return true;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -954,7 +954,8 @@ public boolean onHoverEvent(MotionEvent event) {`
`954`	`954`	`onTouchEvent(event);`
`955`	`955`	`event.setAction(action);`
`956`	`956`	`}`
`957`		`- return super.onHoverEvent(event);`
	`957`	`+ super.onHoverEvent(event);`
	`958`	`+ return true;`
`958`	`959`	`}`
`959`	`960`
`960`	`961`	`/**`