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

am 9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev

Browse Source 
* commit '9a2d5742bd11c2a7a583d53b1ef1ad12d75e239e':
  Fixed when the notification effects are being cleared
This commit is contained in:
Selim Cinek
2015-09-01 23:33:50 +00:00
committed by Android Git Automerger
parent e45761ff90 9a2d5742bd
commit 146dc26511
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1636,11 +1636,13 @@ public abstract class BaseStatusBar extends SystemUI implements
protected void handleVisibleToUserChanged(boolean visibleToUser) { protected void handleVisibleToUserChanged(boolean visibleToUser) {
try { try {
if (visibleToUser) { if (visibleToUser) {
boolean clearNotificationEffects = !isPanelFullyCollapsed() && boolean pinnedHeadsUp = mHeadsUpManager.hasPinnedHeadsUp();
(mShowLockscreenNotifications || boolean clearNotificationEffects =
(mState == StatusBarState.SHADE || mState == StatusBarState.SHADE_LOCKED)); ((mShowLockscreenNotifications && mState == StatusBarState.KEYGUARD) ||
(!pinnedHeadsUp && (mState == StatusBarState.SHADE
|| mState == StatusBarState.SHADE_LOCKED)));
int notificationLoad = mNotificationData.getActiveNotifications().size(); int notificationLoad = mNotificationData.getActiveNotifications().size();
if (mHeadsUpManager.hasPinnedHeadsUp() && isPanelFullyCollapsed()) { if (pinnedHeadsUp && isPanelFullyCollapsed()) {
notificationLoad = 1; notificationLoad = 1;
} else { } else {
MetricsLogger.histogram(mContext, "note_load", notificationLoad); MetricsLogger.histogram(mContext, "note_load", notificationLoad);

9
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -3742,12 +3742,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
// down on the lockscreen), clear notification LED, vibration, // down on the lockscreen), clear notification LED, vibration,
// ringing. // ringing.
// Other transitions are covered in handleVisibleToUserChanged(). // Other transitions are covered in handleVisibleToUserChanged().
if (state != mState && mVisible && state == StatusBarState.SHADE_LOCKED) { if (state != mState && mVisible && (state == StatusBarState.SHADE_LOCKED
try { || (state == StatusBarState.SHADE && isGoingToNotificationShade()))) {
mBarService.clearNotificationEffects(); clearNotificationEffects();
} catch (RemoteException e) {
// Ignore.
}
} }
mState = state; mState = state;
mGroupManager.setStatusBarState(state); mGroupManager.setStatusBarState(state);