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

Improved the transformation to an icon further

Browse Source 
The content now shifts away more and without fading out.

Change-Id: I02b53400a68dc68ef49bc2bd830b51bced5a6ba1
Test: Add notification - test merging behavior
Bug: 32437839
This commit is contained in:
Selim Cinek
2016-11-18 17:52:16 -08:00
parent 938bdaa86e
commit 875a3a11e2
5 changed files with 79 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -89,7 +89,7 @@
<dimen name="notification_icon_appear_padding">15dp</dimen>
<!-- The amount the content shifts upwards when transforming into the icon -->
<dimen name="notification_icon_transform_content_shift">16dp</dimen>
<dimen name="notification_icon_transform_content_shift">32dp</dimen>
<!-- Minimum layouted height of a notification in the statusbar-->
<dimen name="min_notification_layout_height">48dp</dimen>

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

@@ -36,6 +36,7 @@ import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.NotificationHeaderView;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewStub;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo;
@@ -45,6 +46,7 @@ import android.widget.ImageView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.util.NotificationColorUtil;
import com.android.internal.widget.CachingIconView;
import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.classifier.FalsingManager;
@@ -65,6 +67,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
private static final int DEFAULT_DIVIDER_ALPHA = 0x29;
private static final int COLORED_DIVIDER_ALPHA = 0x7B;
private int mIconTransformContentShift;
private int mIconTransformContentShiftNoIcon;
private int mNotificationMinHeightLegacy;
private int mMaxHeadsUpHeightLegacy;
private int mMaxHeadsUpHeight;
@@ -193,6 +196,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
private float mIconTransformationAmount;
private boolean mIconsVisible = true;
private boolean mAboveShelf;
private boolean mIsLastChild;
public boolean isGroupExpansionChanging() {
if (isChildInGroup()) {
@@ -835,11 +839,16 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
*
* @param iconTransformationAmount A value from 0 to 1 indicating how much we are transformed
* to an icon
* @param isLastChild is this the last child in the list. If true, then the transformation is
* different since it's content fades out.
*/
public void setIconTransformationAmount(float iconTransformationAmount) {
if (mIconTransformationAmount != iconTransformationAmount) {
mIconTransformationAmount = iconTransformationAmount;
updateContentFadeOut();
public void setIconTransformationAmount(float iconTransformationAmount, boolean isLastChild) {
boolean changeTransformation = isLastChild != mIsLastChild;
changeTransformation |= mIconTransformationAmount != iconTransformationAmount;
mIsLastChild = isLastChild;
mIconTransformationAmount = iconTransformationAmount;
if (changeTransformation) {
updateContentTransformation();
boolean iconsVisible = mIconTransformationAmount == 0.0f;
if (iconsVisible != mIconsVisible) {
mIconsVisible = iconsVisible;
@@ -853,21 +862,25 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
updateIconVisibilities();
}
private void updateContentFadeOut() {
if (!isChildInGroup()) {
float contentAlpha = 1.0f - mIconTransformationAmount;
contentAlpha = Math.max((contentAlpha - 0.5f) / 0.5f, 0.0f);
private void updateContentTransformation() {
float contentAlpha;
float translationY = - mIconTransformationAmount * mIconTransformContentShift;
if (mIsLastChild) {
contentAlpha = 1.0f - mIconTransformationAmount;
contentAlpha = Math.min(contentAlpha / 0.5f, 1.0f);
contentAlpha = Interpolators.ALPHA_OUT.getInterpolation(contentAlpha);
mPublicLayout.setAlpha(contentAlpha);
float translationY = - mIconTransformationAmount * mIconTransformContentShift;
mPublicLayout.setTranslationY(translationY);
mPrivateLayout.setAlpha(contentAlpha);
mPrivateLayout.setTranslationY(translationY);
if (mChildrenContainer != null) {
mChildrenContainer.setAlpha(contentAlpha);
mChildrenContainer.setTranslationY(translationY);
// TODO: handle children fade out better
}
translationY *= 0.4f;
} else {
contentAlpha = 1.0f;
}
mPublicLayout.setAlpha(contentAlpha);
mPrivateLayout.setAlpha(contentAlpha);
mPublicLayout.setTranslationY(translationY);
mPrivateLayout.setTranslationY(translationY);
if (mChildrenContainer != null) {
mChildrenContainer.setAlpha(contentAlpha);
mChildrenContainer.setTranslationY(translationY);
// TODO: handle children fade out better
}
}
@@ -880,6 +893,26 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
}
}
/**
* Get the relative top padding of a view relative to this view. This recursively walks up the
* hierarchy and does the corresponding measuring.
*
* @param view the view to the the padding for. The requested view has to be a child of this
* notification.
* @return the toppadding
*/
public int getRelativeTopPadding(View view) {
int topPadding = 0;
while (view.getParent() instanceof ViewGroup) {
topPadding += view.getTop();
view = (View) view.getParent();
if (view instanceof ExpandableNotificationRow) {
return topPadding;
}
}
return topPadding;
}
public interface ExpansionLogger {
public void logNotificationExpansion(String key, boolean userAction, boolean expanded);
}
@@ -899,7 +932,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
mMaxHeadsUpHeight = getFontScaledHeight(R.dimen.notification_max_heads_up_height);
mIncreasedPaddingBetweenElements = getResources()
.getDimensionPixelSize(R.dimen.notification_divider_height_increased);
mIconTransformContentShift = getResources().getDimensionPixelSize(
mIconTransformContentShiftNoIcon = getResources().getDimensionPixelSize(
R.dimen.notification_icon_transform_content_shift);
}
@@ -1373,6 +1406,21 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
if (mSettingsIconRow != null) {
mSettingsIconRow.updateVerticalLocation();
}
updateContentShiftHeight();
}
/**
* Updates the content shift height such that the header is completely hidden when coming from
* the top.
*/
private void updateContentShiftHeight() {
NotificationHeaderView notificationHeader = getNotificationHeader();
if (notificationHeader != null) {
CachingIconView icon = notificationHeader.getIcon();
mIconTransformContentShift = getRelativeTopPadding(icon) + icon.getHeight();
} else {
mIconTransformContentShift = mIconTransformContentShiftNoIcon;
}
}
private void updateMaxHeights() {

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

@@ -595,10 +595,16 @@ public class NotificationContentView extends FrameLayout {
updateClipping();
}
@Override
public void setTranslationY(float translationY) {
super.setTranslationY(translationY);
updateClipping();
}
private void updateClipping() {
if (mClipToActualHeight) {
int top = mClipTopAmount;
int bottom = mContentHeight - mClipBottomAmount;
int top = (int) (mClipTopAmount - getTranslationY());
int bottom = (int) (mContentHeight - mClipBottomAmount - getTranslationY());
bottom = Math.max(top, bottom);
mClipBounds.set(0, top, getWidth(), bottom);
setClipBounds(mClipBounds);

17
packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
View File

@@ -308,7 +308,7 @@ public class NotificationShelf extends ActivatableNotificationView {
float notificationIconSize = 0.0f;
int iconTopPadding;
if (rowIcon != null) {
iconTopPadding = getIconTopPadding(rowIcon);
iconTopPadding = row.getRelativeTopPadding(rowIcon);
notificationIconSize = rowIcon.getHeight();
} else {
iconTopPadding = mIconAppearTopPadding;
@@ -347,7 +347,7 @@ public class NotificationShelf extends ActivatableNotificationView {
// The notification size is different from the size in the shelf / statusbar
float newSize = NotificationUtils.interpolate(notificationIconSize, shelfIconSize,
transitionAmount);
row.setIconTransformationAmount(transitionAmount);
row.setIconTransformationAmount(transitionAmount, isLastChild);
if (iconState != null) {
iconState.scaleX = newSize / icon.getHeight() / icon.getIconScale();
iconState.scaleY = iconState.scaleX;
@@ -371,19 +371,6 @@ public class NotificationShelf extends ActivatableNotificationView {
return - (getIntrinsicHeight() - mStatusBarHeight) / 2;
}
private int getIconTopPadding(View icon) {
View view = icon;
int topPadding = 0;
while (view.getParent() instanceof ViewGroup) {
topPadding += view.getTop();
view = (View) view.getParent();
if (view instanceof ExpandableNotificationRow) {
return topPadding;
}
}
return topPadding;
}
public int getNotificationMergeSize() {
return getIntrinsicHeight();
}

2
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java
View File

@@ -212,7 +212,7 @@ public class NotificationChildrenContainer extends ViewGroup {
mDividers.add(newIndex, divider);
updateGroupOverflow();
row.setIconTransformationAmount(0);
row.setIconTransformationAmount(0, false /* isLastChild */);
}
public void removeNotification(ExpandableNotificationRow row) {