Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1cc651b authored by Chris Wren's avatar Chris Wren Committed by Android Git Automerger
Browse files

am c58d1695: Merge changes from topic \'tron\' into mnc-dev 

* commit 'c58d1695':
  remove double count of panel open
  report notification load on panel reveal
parents bf816248 c58d1695

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ interface IStatusBarService 
    // You need the STATUS_BAR_SERVICE permission

    void registerStatusBar(IStatusBar callbacks, out StatusBarIconList iconList,

            out int[] switches, out List<IBinder> binders);

    void onPanelRevealed(boolean clearNotificationEffects);

    void onPanelRevealed(boolean clearNotificationEffects, int numItems);

    void onPanelHidden();

    // Mark current notifications as "seen" and stop ringing, vibrating, blinking.

    void clearNotificationEffects();

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+7 −1
Original line number Diff line number Diff line
@@ -1623,7 +1623,13 @@ public abstract class BaseStatusBar extends SystemUI implements 
                boolean clearNotificationEffects = !isPanelFullyCollapsed() &&

                    (mShowLockscreenNotifications ||

                        (mState == StatusBarState.SHADE || mState == StatusBarState.SHADE_LOCKED));

                mBarService.onPanelRevealed(clearNotificationEffects);

                int notificationLoad = mNotificationData.getActiveNotifications().size();

                if (mHeadsUpManager.hasPinnedHeadsUp() && isPanelFullyCollapsed())  {

                    notificationLoad = 1;

                } else {

                    MetricsLogger.histogram(mContext, "note_load", notificationLoad);

                }

                mBarService.onPanelRevealed(clearNotificationEffects, notificationLoad);

            } else {

                mBarService.onPanelHidden();

            }

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+0 −1
Original line number Diff line number Diff line
@@ -721,7 +721,6 @@ public class NotificationPanelView extends PanelView implements 
        if (mListenForHeadsUp && !mHeadsUpTouchHelper.isTrackingHeadsUp()

                && mHeadsUpTouchHelper.onInterceptTouchEvent(event)) {

            mIsExpansionFromHeadsUp = true;

            MetricsLogger.count(mContext, COUNTER_PANEL_OPEN, 1);

            MetricsLogger.count(mContext, COUNTER_PANEL_OPEN_PEEK, 1);

        }

        if ((!mIsExpanding || mHintAnimationRunning)

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

+1 −0
Original line number Diff line number Diff line
@@ -1180,6 +1180,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                        notification.getKey());

                notification.getNotification().fullScreenIntent.send();

                shadeEntry.notifyFullScreenIntentLaunched();

                MetricsLogger.count(mContext, "note_fullscreen", 1);

            } catch (PendingIntent.CanceledException e) {

            }

        }

packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java

+5 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.view.View; 
import android.view.ViewTreeObserver;

import android.view.accessibility.AccessibilityEvent;



import com.android.internal.logging.MetricsLogger;

import com.android.systemui.R;

import com.android.systemui.statusbar.ExpandableNotificationRow;

import com.android.systemui.statusbar.NotificationData;
@@ -82,6 +83,7 @@ public class HeadsUpManager implements ViewTreeObserver.OnComputeInternalInsetsL 
    private final View mStatusBarWindowView;

    private final int mStatusBarHeight;

    private final int mNotificationsTopPadding;

    private final Context mContext;

    private PhoneStatusBar mBar;

    private int mSnoozeLengthMs;

    private ContentObserver mSettingsObserver;
@@ -101,7 +103,8 @@ public class HeadsUpManager implements ViewTreeObserver.OnComputeInternalInsetsL 
    private boolean mIsObserving;



    public HeadsUpManager(final Context context, View statusBarWindowView) {

        Resources resources = context.getResources();

        mContext = context;

        Resources resources = mContext.getResources();

        mTouchAcceptanceDelay = resources.getInteger(R.integer.touch_acceptance_delay);

        mSnoozedPackages = new ArrayMap<>();

        mDefaultSnoozeLengthMs = resources.getInteger(R.integer.heads_up_default_snooze_length_ms);
@@ -165,6 +168,7 @@ public class HeadsUpManager implements ViewTreeObserver.OnComputeInternalInsetsL 
     */

    public void showNotification(NotificationData.Entry headsUp) {

        if (DEBUG) Log.v(TAG, "showNotification");

        MetricsLogger.count(mContext, "note_peek", 1);

        addHeadsUpEntry(headsUp);

        updateNotification(headsUp, true);

        headsUp.setInterruption();
@@ -522,7 +526,6 @@ public class HeadsUpManager implements ViewTreeObserver.OnComputeInternalInsetsL 
        });

    }





    /**

     * This represents a notification and how long it is in a heads up mode. It also manages its

     * lifecycle automatically when created.