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

Fixed an issue where the action bar below wasn't rounded

Browse Source 
Bug: 69168591
Test: add notification with action bar, observe propper rounding
Change-Id: I69d3a7c776635b1c63d0b91b998f066a0d2f130f
This commit is contained in:
Selim Cinek
2018-01-17 11:00:47 -08:00
parent 1397ea3b91
commit 86bfcee04b
6 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2377,7 +2377,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
NotificationContentView contentView = (NotificationContentView) child;
if (isClippingNeeded()) {
return true;
} else if (!hasNoRounding() && contentView.shouldClipToRounding()) {
} else if (!hasNoRounding()
&& contentView.shouldClipToRounding(getCurrentTopRoundness() != 0.0f,
getCurrentBottomRoundness() != 0.0f)) {
return true;
}
} else if (child == mChildrenContainer) {

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

@@ -1489,19 +1489,21 @@ public class NotificationContentView extends FrameLayout {
return false;
}
public boolean shouldClipToRounding() {
boolean needsPaddings = shouldClipToRounding(getVisibleType());
public boolean shouldClipToRounding(boolean topRounded, boolean bottomRounded) {
boolean needsPaddings = shouldClipToRounding(getVisibleType(), topRounded, bottomRounded);
if (mUserExpanding) {
needsPaddings |= shouldClipToRounding(mTransformationStartVisibleType);
needsPaddings |= shouldClipToRounding(mTransformationStartVisibleType, topRounded,
bottomRounded);
}
return needsPaddings;
}
private boolean shouldClipToRounding(int visibleType) {
private boolean shouldClipToRounding(int visibleType, boolean topRounded,
boolean bottomRounded) {
NotificationViewWrapper visibleWrapper = getVisibleWrapper(visibleType);
if (visibleWrapper == null) {
return false;
}
return visibleWrapper.shouldClipToRounding();
return visibleWrapper.shouldClipToRounding(topRounded, bottomRounded);
}
}

3
packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java
View File

@@ -21,7 +21,6 @@ import android.animation.AnimatorListenerAdapter;
import android.content.Context;
import android.graphics.ColorMatrixColorFilter;
import android.graphics.Paint;
import android.os.Build;
import android.view.View;
import com.android.systemui.R;
@@ -118,7 +117,7 @@ public class NotificationCustomViewWrapper extends NotificationViewWrapper {
}
@Override
public boolean shouldClipToRounding() {
public boolean shouldClipToRounding(boolean topRounded, boolean bottomRounded) {
return true;
}
}

2
packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationMediaTemplateViewWrapper.java
View File

@@ -62,7 +62,7 @@ public class NotificationMediaTemplateViewWrapper extends NotificationTemplateVi
}
@Override
public boolean shouldClipToRounding() {
public boolean shouldClipToRounding(boolean topRounded, boolean bottomRounded) {
return true;
}
}

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

@@ -265,6 +265,15 @@ public class NotificationTemplateViewWrapper extends NotificationHeaderViewWrapp
updateActionOffset();
}
@Override
public boolean shouldClipToRounding(boolean topRounded, boolean bottomRounded) {
if (super.shouldClipToRounding(topRounded, bottomRounded)) {
return true;
}
return bottomRounded && mActionsContainer != null
&& mActionsContainer.getVisibility() != View.GONE;
}
private void updateActionOffset() {
if (mActionsContainer != null) {
// We should never push the actions higher than they are in the headsup view.

2
packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationViewWrapper.java
View File

@@ -195,7 +195,7 @@ public abstract class NotificationViewWrapper implements TransformableView {
return 0;
}
public boolean shouldClipToRounding() {
public boolean shouldClipToRounding(boolean topRounded, boolean bottomRounded) {
return false;
}
}