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

Merge "Fix group divider make chrome crash issue."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-12 23:46:53 +00:00
committed by Android (Google) Code Review
parent 478edb7604 670ceded12
commit 8596362b7e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/view/menu/ListMenuItemView.java
View File

@@ -319,13 +319,15 @@ public class ListMenuItemView extends LinearLayout
public void setGroupDividerEnabled(boolean groupDividerEnabled) {
// If mHasListDivider is true, disabling the groupDivider.
// Otherwise, checking enbling it according to groupDividerEnabled flag.
mGroupDivider.setVisibility(!mHasListDivider
&& groupDividerEnabled ? View.VISIBLE : View.GONE);
if (mGroupDivider != null) {
mGroupDivider.setVisibility(!mHasListDivider
&& groupDividerEnabled ? View.VISIBLE : View.GONE);
}
}
@Override
public void adjustListItemSelectionBounds(Rect rect) {
if (mGroupDivider.getVisibility() == View.VISIBLE) {
if (mGroupDivider != null && mGroupDivider.getVisibility() == View.VISIBLE) {
// groupDivider is a part of MenuItemListView.
// If ListMenuItem with divider enabled is hovered/clicked, divider also gets selected.
// Clipping the selector bounds from the top divider portion when divider is enabled,