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

Commit 528c2df4 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Ensure the device wakes up from doze when tapping expand button" into... 

Merge "Ensure the device wakes up from doze when tapping expand button" into sc-dev am: ba1e18b5 am: 05615c12

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15327940

Change-Id: I3232efdb7c9015f38980d25978434e33ede679d6
parents 94960631 05615c12

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+3 −3
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
                mGroupExpansionChanging = true;

                final boolean wasExpanded = mGroupExpansionManager.isGroupExpanded(mEntry);

                boolean nowExpanded = mGroupExpansionManager.toggleGroupExpansion(mEntry);

                mOnExpandClickListener.onExpandClicked(mEntry, nowExpanded);

                mOnExpandClickListener.onExpandClicked(mEntry, v, nowExpanded);

                MetricsLogger.action(mContext, MetricsEvent.ACTION_NOTIFICATION_GROUP_EXPANDER,

                        nowExpanded);

                onExpansionChanged(true /* userAction */, wasExpanded);
@@ -310,7 +310,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
                    setUserExpanded(nowExpanded);

                }

                notifyHeightChanged(true);

                mOnExpandClickListener.onExpandClicked(mEntry, nowExpanded);

                mOnExpandClickListener.onExpandClicked(mEntry, v, nowExpanded);

                MetricsLogger.action(mContext, MetricsEvent.ACTION_NOTIFICATION_EXPANDER,

                        nowExpanded);

            }
@@ -3064,7 +3064,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    }



    public interface OnExpandClickListener {

        void onExpandClicked(NotificationEntry clickedEntry, boolean nowExpanded);

        void onExpandClicked(NotificationEntry clickedEntry, View clickedView, boolean nowExpanded);

    }



    @Override

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

+5 −1
Original line number Diff line number Diff line
@@ -24,12 +24,14 @@ import android.app.KeyguardManager; 
import android.content.Context;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.service.notification.NotificationListenerService;

import android.service.notification.StatusBarNotification;

import android.service.vr.IVrManager;

import android.service.vr.IVrStateCallbacks;

import android.util.Log;

import android.util.Slog;

import android.view.View;

import android.view.accessibility.AccessibilityManager;

import android.widget.TextView;
@@ -392,8 +394,10 @@ public class StatusBarNotificationPresenter implements NotificationPresenter, 
    }



    @Override

    public void onExpandClicked(NotificationEntry clickedEntry, boolean nowExpanded) {

    public void onExpandClicked(NotificationEntry clickedEntry, View clickedView,

            boolean nowExpanded) {

        mHeadsUpManager.setExpanded(clickedEntry, nowExpanded);

        mStatusBar.wakeUpIfDozing(SystemClock.uptimeMillis(), clickedView, "NOTIFICATION_CLICK");

        if (nowExpanded) {

            if (mStatusBarStateController.getState() == StatusBarState.KEYGUARD) {

                mShadeTransitionController.goToLockedShade(clickedEntry.getRow());