isInside(mScrollAdapter.getHostView(), x, y)
&& mScrollAdapter.isScrolledToTop();
mResizedView = findView(x, y);
- if (mResizedView != null && (isFullyExpanded(mResizedView)
- || !mCallback.canChildBeExpanded(mResizedView))) {
+ if (mResizedView != null && !mCallback.canChildBeExpanded(mResizedView)) {
mResizedView = null;
mWatchingForPull = false;
}
mDefaultSnoozeLengthMs = resources.getInteger(R.integer.heads_up_default_snooze_length_ms);
mSnoozeLengthMs = mDefaultSnoozeLengthMs;
mMinimumDisplayTime = resources.getInteger(R.integer.heads_up_notification_minimum_time);
- mHeadsUpNotificationDecay = 200000000/*resources.getInteger(R.integer.heads_up_notification_decay)*/;;
+ mHeadsUpNotificationDecay = resources.getInteger(R.integer.heads_up_notification_decay);
mClock = new Clock();
// TODO: shadow mSwipeHelper.setMaxSwipeProgress(mMaxAlpha);
// add the padding before this element
height += mPaddingBetweenElements;
}
- if (child instanceof ExpandableNotificationRow) {
- ExpandableNotificationRow row = (ExpandableNotificationRow) child;
- height += row.getIntrinsicHeight();
- } else if (child instanceof ExpandableView) {
+ if (child instanceof ExpandableView) {
ExpandableView expandableView = (ExpandableView) child;
- height += expandableView.getActualHeight();
+ height += expandableView.getIntrinsicHeight();
}
}
}
// Ensure that a headsUp is never below the topmost headsUp
StackViewState topState = resultState.getViewStateForView(topHeadsUpEntry);
childState.height = row.getHeadsUpHeight();
- childState.yTranslation = Math.min(childState.yTranslation,
- topState.yTranslation + topState.height - childState.height);
+ childState.yTranslation = topState.yTranslation + topState.height
+ - childState.height;
}
} else if (mIsExpanded) {
if (isTopEntry) {