commit 12209b9afed4aff5b219d704c49d0f0c12e3cc52
author Alan Viverette <alanv@google.com> Mon Nov 23 17:26:38 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 23 17:26:38 2015 +0000
tree 03797a63799d658e4f06bcd310c848c3c91bddde
parent 95e6ad7b4204962a4fcf8d602d2d0689562dbae9
parent 7add7e04969a23d90fc41331912c3114770bde82

Merge "Only look for nearest child View in ViewGroup"

core/java/android/widget/TimePickerClockDelegate.java

diff --git a/core/java/android/widget/TimePickerClockDelegate.java b/core/java/android/widget/TimePickerClockDelegate.java
index a24fb40..1d6e52c 100644
--- a/core/java/android/widget/TimePickerClockDelegate.java
+++ b/core/java/android/widget/TimePickerClockDelegate.java
@@ -880,8 +880,12 @@
             public boolean onTouch(View view, MotionEvent motionEvent) {
                 final int actionMasked = motionEvent.getActionMasked();
                 if (actionMasked == MotionEvent.ACTION_DOWN) {
-                    mInitialTouchTarget = findNearestChild((ViewGroup) view,
-                            (int) motionEvent.getX(), (int) motionEvent.getY());
+                    if (view instanceof ViewGroup) {
+                        mInitialTouchTarget = findNearestChild((ViewGroup) view,
+                                (int) motionEvent.getX(), (int) motionEvent.getY());
+                    } else {
+                        mInitialTouchTarget = null;
+                    }
                 }
 
                 final View child = mInitialTouchTarget;