Merge "Fixed a bug in the notification touch selection." into lmp-dev (9547fd4a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -754,15 +754,20 @@ public abstract class BaseStatusBar extends SystemUI implements
		public boolean onLongPress(View v, int x, int y) {
		dismissPopups();

		if (v.getWindowToken() == null) return false;
		if (v.getWindowToken() == null) {
		Log.e(TAG, "Trying to show notification guts, but not attached to window");
		return false;
		}

		// Assume we are a status_bar_notification_row
		final NotificationGuts guts = (NotificationGuts) v.findViewById(
		R.id.notification_guts);
		if (guts == null) return false;

		// Already showing?
		if (guts.getVisibility() == View.VISIBLE) return false;
		if (guts.getVisibility() == View.VISIBLE) {
		Log.e(TAG, "Trying to show notification guts, but already visible");
		return false;
		}

		guts.setVisibility(View.VISIBLE);
		final double horz = Math.max(guts.getWidth() - x, x);

+2 −2

Original line number	Diff line number	Diff line
		@@ -580,7 +580,7 @@ public class NotificationStackScrollLayout extends ViewGroup
		}
		float childTop = slidingChild.getTranslationY();
		float top = childTop + slidingChild.getClipTopAmount();
		float bottom = top + slidingChild.getActualHeight();
		float bottom = childTop + slidingChild.getActualHeight();

		// Allow the full width of this view to prevent gesture conflict on Keyguard (phone and
		// camera affordance).
		@@ -1530,7 +1530,7 @@ public class NotificationStackScrollLayout extends ViewGroup
		return position;
		}
		if (child.getVisibility() != View.GONE) {
		position += child.getHeight();
		position += getIntrinsicHeight(child);
		if (i < getChildCount()-1) {
		position += mPaddingBetweenElements;
		}