Merge "Fix issue #3374356: Buttons sometimes don't highlight" into honeycomb (e69e0fde) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -5027,6 +5027,15 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		focusTaken = requestFocus();
		}

		if (prepressed) {
		// The button is being released before we actually
		// showed it as pressed. Make it show the pressed
		// state now (before scheduling the click) to ensure
		// the user sees it.
		mPrivateFlags \|= PRESSED;
		refreshDrawableState();
		}

		if (!mHasPerformedLongPress) {
		// This is a tap, so remove the longpress check
		removeLongPressCallback();
		@@ -5050,8 +5059,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		}

		if (prepressed) {
		mPrivateFlags \|= PRESSED;
		refreshDrawableState();
		postDelayed(mUnsetPressedState,
		ViewConfiguration.getPressedStateDuration());
		} else if (!post(mUnsetPressedState)) {