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

[NR] Remove unnecessary boolean change, update var names

Browse Source 
Removing unnecessary variable change (mNeedsAnimation) and making the
heads up variables a little more logical to read.

Test: Manually, no breakages in animation events-removed extra call only
Change-Id: I9ccda926449da7bec181b6986683179edb64ee91
This commit is contained in:
Rohan Shah
2018-06-25 16:27:16 -07:00
parent 6d5bdf293d
commit b9d500abc8
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,12 +124,12 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
private final NotificationInflater mNotificationInflater;
private int mIconTransformContentShift;
private int mIconTransformContentShiftNoIcon;
private int mNotificationMinHeightLegacy;
private int mNotificationMinHeightBeforeP;
private int mMaxHeadsUpHeightLegacy;
private int mMaxHeadsUpHeightBeforeN;
private int mMaxHeadsUpHeightBeforeP;
private int mMaxHeadsUpHeight;
private int mMaxHeadsUpHeightIncreased;
private int mNotificationMinHeightBeforeN;
private int mNotificationMinHeightBeforeP;
private int mNotificationMinHeight;
private int mNotificationMinHeightLarge;
private int mNotificationMaxHeight;
@@ -546,7 +546,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
boolean beforeP = mEntry.targetSdk < Build.VERSION_CODES.P;
int minHeight;
if (customView && beforeP && !mIsSummaryWithChildren) {
minHeight = beforeN ? mNotificationMinHeightLegacy : mNotificationMinHeightBeforeP;
minHeight = beforeN ? mNotificationMinHeightBeforeN : mNotificationMinHeightBeforeP;
} else if (mUseIncreasedCollapsedHeight && layout == mPrivateLayout) {
minHeight = mNotificationMinHeightLarge;
} else {
@@ -555,20 +555,20 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
boolean headsUpCustom = layout.getHeadsUpChild() != null &&
layout.getHeadsUpChild().getId()
!= com.android.internal.R.id.status_bar_latest_event_content;
int headsUpheight;
int headsUpHeight;
if (headsUpCustom && beforeP) {
headsUpheight = beforeN ? mMaxHeadsUpHeightLegacy : mMaxHeadsUpHeightBeforeP;
headsUpHeight = beforeN ? mMaxHeadsUpHeightBeforeN : mMaxHeadsUpHeightBeforeP;
} else if (mUseIncreasedHeadsUpHeight && layout == mPrivateLayout) {
headsUpheight = mMaxHeadsUpHeightIncreased;
headsUpHeight = mMaxHeadsUpHeightIncreased;
} else {
headsUpheight = mMaxHeadsUpHeight;
headsUpHeight = mMaxHeadsUpHeight;
}
NotificationViewWrapper headsUpWrapper = layout.getVisibleWrapper(
NotificationContentView.VISIBLE_TYPE_HEADSUP);
if (headsUpWrapper != null) {
headsUpheight = Math.max(headsUpheight, headsUpWrapper.getMinLayoutHeight());
headsUpHeight = Math.max(headsUpHeight, headsUpWrapper.getMinLayoutHeight());
}
layout.setHeights(minHeight, headsUpheight, mNotificationMaxHeight,
layout.setHeights(minHeight, headsUpHeight, mNotificationMaxHeight,
mNotificationAmbientHeight);
}
@@ -1487,7 +1487,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
}
private void initDimens() {
mNotificationMinHeightLegacy = NotificationUtils.getFontScaledHeight(mContext,
mNotificationMinHeightBeforeN = NotificationUtils.getFontScaledHeight(mContext,
R.dimen.notification_min_height_legacy);
mNotificationMinHeightBeforeP = NotificationUtils.getFontScaledHeight(mContext,
R.dimen.notification_min_height_before_p);
@@ -1499,7 +1499,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
R.dimen.notification_max_height);
mNotificationAmbientHeight = NotificationUtils.getFontScaledHeight(mContext,
R.dimen.notification_ambient_height);
mMaxHeadsUpHeightLegacy = NotificationUtils.getFontScaledHeight(mContext,
mMaxHeadsUpHeightBeforeN = NotificationUtils.getFontScaledHeight(mContext,
R.dimen.notification_max_heads_up_height_legacy);
mMaxHeadsUpHeightBeforeP = NotificationUtils.getFontScaledHeight(mContext,
R.dimen.notification_max_heads_up_height_before_p);

5
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
View File

@@ -3169,7 +3169,7 @@ public class NotificationStackScrollLayout extends ViewGroup
private void startAnimationToState() {
if (mNeedsAnimation) {
generateChildHierarchyEvents();
generateAllAnimationEvents();
mNeedsAnimation = false;
}
if (!mAnimationEvents.isEmpty() || isCurrentlyAnimating()) {
@@ -3186,7 +3186,7 @@ public class NotificationStackScrollLayout extends ViewGroup
mGoToFullShadeDelay = 0;
}
private void generateChildHierarchyEvents() {
private void generateAllAnimationEvents() {
generateHeadsUpAnimationEvents();
generateChildRemovalEvents();
generateChildAdditionEvents();
@@ -3203,7 +3203,6 @@ public class NotificationStackScrollLayout extends ViewGroup
generateGroupExpansionEvent();
generateAnimateEverythingEvent();
generatePulsingAnimationEvent();
mNeedsAnimation = false;
}
private void generateHeadsUpAnimationEvents() {