Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed a clicking bug on the lockscreen" into nyc-dev

Browse Source
This commit is contained in:
Selim Cinek
2016-02-19 23:04:54 +00:00
committed by Android (Google) Code Review
parent c68190ae90 34eda5ed70
commit e961f32b0f
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
View File

@@ -519,6 +519,13 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
return mPrivateLayout.getNotificationHeader();
}
private NotificationHeaderView getVisibleNotificationHeader() {
if (mNotificationHeader != null) {
return mNotificationHeader;
}
return getShowingLayout().getVisibleNotificationHeader();
}
public void setOnExpandClickListener(OnExpandClickListener onExpandClickListener) {
mOnExpandClickListener = onExpandClickListener;
}
@@ -1293,7 +1300,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
protected boolean disallowSingleClick(MotionEvent event) {
float x = event.getX();
float y = event.getY();
NotificationHeaderView header = getNotificationHeader();
NotificationHeaderView header = getVisibleNotificationHeader();
if (header != null) {
return header.isInTouchRect(x, y);
}

18
packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
View File

@@ -475,6 +475,19 @@ public class NotificationContentView extends FrameLayout {
}
}
private NotificationViewWrapper getCurrentVisibleWrapper() {
switch (mVisibleType) {
case VISIBLE_TYPE_EXPANDED:
return mExpandedWrapper;
case VISIBLE_TYPE_HEADSUP:
return mHeadsUpWrapper;
case VISIBLE_TYPE_CONTRACTED:
return mContractedWrapper;
default:
return null;
}
}
/**
* @return one of the static enum types in this view, calculated form the current state
*/
@@ -684,6 +697,11 @@ public class NotificationContentView extends FrameLayout {
return header;
}
public NotificationHeaderView getVisibleNotificationHeader() {
NotificationViewWrapper wrapper = getCurrentVisibleWrapper();
return wrapper == null ? null : wrapper.getNotificationHeader();
}
public void setContainingNotification(ExpandableNotificationRow containingNotification) {
mContainingNotification = containingNotification;
}