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

Merge "Set the height of the right_icon in addition to the width" into sc-dev

Browse Source
This commit is contained in:
Jeff DeCew
2021-05-13 19:48:40 +00:00
committed by Android (Google) Code Review
parent 05ba318dfc 0fb49d82a6
commit a5b0ed3b0c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/Notification.java
View File

@@ -5338,7 +5338,7 @@ public class Notification implements Parcelable
} }
final float extraMarginEndDpIfVisible = viewWidthDp + iconMarginDp; final float extraMarginEndDpIfVisible = viewWidthDp + iconMarginDp;
result.setRightIconState(rightIcon != null /* visible */, viewWidthDp, result.setRightIconState(rightIcon != null /* visible */, viewWidthDp,
extraMarginEndDpIfVisible, expanderSizeDp); viewHeightDp, extraMarginEndDpIfVisible, expanderSizeDp);
} }
/** /**
@@ -5375,6 +5375,8 @@ public class Notification implements Parcelable
if (rightIcon != null) { if (rightIcon != null) {
contentView.setViewLayoutWidth(R.id.right_icon, contentView.setViewLayoutWidth(R.id.right_icon,
result.mRightIconWidthDp, TypedValue.COMPLEX_UNIT_DIP); result.mRightIconWidthDp, TypedValue.COMPLEX_UNIT_DIP);
contentView.setViewLayoutHeight(R.id.right_icon,
result.mRightIconHeightDp, TypedValue.COMPLEX_UNIT_DIP);
contentView.setViewVisibility(R.id.right_icon, View.VISIBLE); contentView.setViewVisibility(R.id.right_icon, View.VISIBLE);
contentView.setImageViewIcon(R.id.right_icon, rightIcon); contentView.setImageViewIcon(R.id.right_icon, rightIcon);
contentView.setIntTag(R.id.right_icon, R.id.tag_keep_when_showing_left_icon, contentView.setIntTag(R.id.right_icon, R.id.tag_keep_when_showing_left_icon,
@@ -12119,6 +12121,7 @@ public class Notification implements Parcelable
private static class TemplateBindResult { private static class TemplateBindResult {
boolean mRightIconVisible; boolean mRightIconVisible;
float mRightIconWidthDp; float mRightIconWidthDp;
float mRightIconHeightDp;
/** /**
* The margin end that needs to be added to the heading so that it won't overlap * The margin end that needs to be added to the heading so that it won't overlap
@@ -12143,10 +12146,11 @@ public class Notification implements Parcelable
*/ */
public final MarginSet mTitleMarginSet = new MarginSet(); public final MarginSet mTitleMarginSet = new MarginSet();
public void setRightIconState(boolean visible, float widthDp, public void setRightIconState(boolean visible, float widthDp, float heightDp,
float marginEndDpIfVisible, float expanderSizeDp) { float marginEndDpIfVisible, float expanderSizeDp) {
mRightIconVisible = visible; mRightIconVisible = visible;
mRightIconWidthDp = widthDp; mRightIconWidthDp = widthDp;
mRightIconHeightDp = heightDp;
mHeadingExtraMarginSet.setValues(0, marginEndDpIfVisible); mHeadingExtraMarginSet.setValues(0, marginEndDpIfVisible);
mHeadingFullMarginSet.setValues(expanderSizeDp, marginEndDpIfVisible + expanderSizeDp); mHeadingFullMarginSet.setValues(expanderSizeDp, marginEndDpIfVisible + expanderSizeDp);
mTitleMarginSet.setValues(0, marginEndDpIfVisible + expanderSizeDp); mTitleMarginSet.setValues(0, marginEndDpIfVisible + expanderSizeDp);