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

Merge "Apapted the touch region for notification headers"

Browse Source
This commit is contained in:
Selim Cinek
2016-02-04 18:30:01 +00:00
committed by Android (Google) Code Review
parent c1e3a38d29 4c4c7384d4
commit ae7c208adf
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/view/NotificationHeaderView.java
View File

@@ -134,12 +134,8 @@ public class NotificationHeaderView extends ViewGroup {
int childWidthSpec = MeasureSpec.makeMeasureSpec(newSize, MeasureSpec.AT_MOST);
mSubTextView.measure(childWidthSpec, wrapContentHeightSpec);
}
totalWidth = givenWidth;
}
if (mProfileBadge.getVisibility() != View.GONE) {
totalWidth = givenWidth;
}
setMeasuredDimension(totalWidth, givenHeight);
setMeasuredDimension(givenWidth, givenHeight);
}
@Override
@@ -285,18 +281,16 @@ public class NotificationHeaderView extends ViewGroup {
mTouchRects.clear();
addRectAroundViewView(mIcon);
addRectAroundViewView(mExpandButton);
addInBetweenRect();
addWidthRect();
mTouchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop();
}
private void addInBetweenRect() {
final Rect r = new Rect();
private void addWidthRect() {
Rect r = new Rect();
r.top = 0;
r.bottom = (int) (32 * getResources().getDisplayMetrics().density);
Rect leftRect = mTouchRects.get(0);
r.left = leftRect.right;
Rect rightRect = mTouchRects.get(1);
r.right = rightRect.left;
r.left = 0;
r.right = getWidth();
mTouchRects.add(r);
}