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

Merge "Fixed the icon clipping of the notification shelf" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-08 21:14:01 +00:00
committed by Android (Google) Code Review
parent 30d6df4514 6eaacf25aa
commit 7e03612659
2 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/values/ids.xml
View File

@@ -59,6 +59,7 @@
<item type="id" name="transformation_start_y_tag"/> <item type="id" name="transformation_start_y_tag"/>
<item type="id" name="transformation_start_scale_x_tag"/> <item type="id" name="transformation_start_scale_x_tag"/>
<item type="id" name="transformation_start_scale_y_tag"/> <item type="id" name="transformation_start_scale_y_tag"/>
<item type="id" name="continuous_clipping_tag"/>
<!-- Whether the icon is from a notification for which targetSdk < L --> <!-- Whether the icon is from a notification for which targetSdk < L -->
<item type="id" name="icon_is_pre_L"/> <item type="id" name="icon_is_pre_L"/>

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

@@ -22,10 +22,12 @@ import static com.android.systemui.statusbar.phone.NotificationIconContainer.OVE
import android.content.Context; import android.content.Context;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Rect;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo;
import com.android.systemui.Interpolators; import com.android.systemui.Interpolators;
@@ -53,6 +55,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
SystemProperties.getBoolean("debug.icon_opening_animations", true); SystemProperties.getBoolean("debug.icon_opening_animations", true);
private static final boolean ICON_ANMATIONS_WHILE_SCROLLING private static final boolean ICON_ANMATIONS_WHILE_SCROLLING
= SystemProperties.getBoolean("debug.icon_scroll_animations", true); = SystemProperties.getBoolean("debug.icon_scroll_animations", true);
private static final int TAG_CONTINUOUS_CLIPPING = R.id.continuous_clipping_tag;
private ViewInvertHelper mViewInvertHelper; private ViewInvertHelper mViewInvertHelper;
private boolean mDark; private boolean mDark;
private NotificationIconContainer mShelfIcons; private NotificationIconContainer mShelfIcons;
@@ -305,6 +308,16 @@ public class NotificationShelf extends ActivatableNotificationView implements
mShelfIcons.setSpeedBumpIndex(mAmbientState.getSpeedBumpIndex()); mShelfIcons.setSpeedBumpIndex(mAmbientState.getSpeedBumpIndex());
mShelfIcons.calculateIconTranslations(); mShelfIcons.calculateIconTranslations();
mShelfIcons.applyIconStates(); mShelfIcons.applyIconStates();
for (int i = 0; i < mHostLayout.getChildCount(); i++) {
View child = mHostLayout.getChildAt(i);
if (!(child instanceof ExpandableNotificationRow)
|| child.getVisibility() == GONE) {
continue;
}
ExpandableNotificationRow row = (ExpandableNotificationRow) child;
updateIconClipAmount(row);
updateContinuousClipping(row);
}
boolean hideBackground = numViewsInShelf < 1.0f; boolean hideBackground = numViewsInShelf < 1.0f;
setHideBackground(hideBackground || backgroundForceHidden); setHideBackground(hideBackground || backgroundForceHidden);
if (mNotGoneIndex == -1) { if (mNotGoneIndex == -1) {
@@ -312,6 +325,43 @@ public class NotificationShelf extends ActivatableNotificationView implements
} }
} }
private void updateIconClipAmount(ExpandableNotificationRow row) {
float maxTop = row.getTranslationY();
StatusBarIconView icon = row.getEntry().expandedIcon;
float shelfIconPosition = getTranslationY() + icon.getTop() + icon.getTranslationY();
if (shelfIconPosition < maxTop) {
int top = (int) (maxTop - shelfIconPosition);
Rect clipRect = new Rect(0, top, icon.getWidth(), Math.max(top, icon.getHeight()));
icon.setClipBounds(clipRect);
} else {
icon.setClipBounds(null);
}
}
private void updateContinuousClipping(final ExpandableNotificationRow row) {
StatusBarIconView icon = row.getEntry().expandedIcon;
boolean needsContinuousClipping = ViewState.isAnimatingY(icon);
boolean isContinuousClipping = icon.getTag(TAG_CONTINUOUS_CLIPPING) != null;
if (needsContinuousClipping && !isContinuousClipping) {
ViewTreeObserver.OnPreDrawListener predrawListener =
new ViewTreeObserver.OnPreDrawListener() {
@Override
public boolean onPreDraw() {
boolean animatingY = ViewState.isAnimatingY(icon);
if (!animatingY || !icon.isAttachedToWindow()) {
icon.getViewTreeObserver().removeOnPreDrawListener(this);
icon.setTag(TAG_CONTINUOUS_CLIPPING, null);
return true;
}
updateIconClipAmount(row);
return true;
}
};
icon.getViewTreeObserver().addOnPreDrawListener(predrawListener);
icon.setTag(TAG_CONTINUOUS_CLIPPING, predrawListener);
}
}
private void updateNotificationClipHeight(ExpandableNotificationRow row, private void updateNotificationClipHeight(ExpandableNotificationRow row,
float notificationClipEnd) { float notificationClipEnd) {
float viewEnd = row.getTranslationY() + row.getActualHeight(); float viewEnd = row.getTranslationY() + row.getActualHeight();