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

Merge "Fixed a bug with the overflow number" into nyc-dev

Browse Source 
am: db9f8d1

* commit 'db9f8d1d60f3bd5c2c94908aa6b0663c1c0cc978':
  Fixed a bug with the overflow number

Change-Id: Ia18fd9a1f33c96661fe672f8817412d1efff3704
This commit is contained in:
Selim Cinek
2016-04-18 17:58:07 +00:00
committed by android-build-merger
parent bbfe7f7d23 db9f8d1d60
commit 76e0d7dd18
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,7 @@ import android.widget.Chronometer;
import android.widget.ImageView;
import android.widget.RemoteViews;
import com.android.internal.util.NotificationColorUtil;
import com.android.systemui.R;
import com.android.systemui.classifier.FalsingManager;
import com.android.systemui.statusbar.notification.HybridNotificationView;
@@ -103,6 +104,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
private int mMaxExpandHeight;
private int mHeadsUpHeight;
private View mVetoButton;
private int mNotificationColor;
private boolean mClearable;
private ExpansionLogger mLogger;
private String mLoggingKey;
@@ -226,6 +228,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
mPrivateLayout.onNotificationUpdated(entry);
mPublicLayout.onNotificationUpdated(entry);
mShowingPublicInitialized = false;
updateNotificationColor();
updateClearability();
if (mIsSummaryWithChildren) {
recreateNotificationHeader();
@@ -603,11 +606,12 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
}
public int getNotificationColor() {
int color = getStatusBarNotification().getNotification().color;
if (color == Notification.COLOR_DEFAULT) {
return mContext.getColor(com.android.internal.R.color.notification_icon_default_color);
}
return color;
return mNotificationColor;
}
private void updateNotificationColor() {
mNotificationColor = NotificationColorUtil.resolveContrastColor(mContext,
getStatusBarNotification().getNotification().color);
}
public HybridNotificationView getSingleLineView() {

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

@@ -663,6 +663,11 @@ public class NotificationChildrenContainer extends ViewGroup {
addView(divider, index);
mDividers.set(i, divider);
}
removeView(mOverflowNumber);
mOverflowNumber = null;
mOverflowInvertHelper = null;
mGroupOverFlowState = null;
updateGroupOverflow();
}
public void setUserLocked(boolean userLocked) {