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

Commit 6e7ece7e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "heads-up-ambient-inflation" 

* changes:
  Fix heads up views freeing too early.
  Inflate ambient + heads up view as necessary
parents 29077124 d5022f97

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

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.systemui.statusbar;



import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_AMBIENT;



import android.annotation.NonNull;

import android.content.Context;

import android.content.res.Resources;
@@ -85,6 +87,7 @@ public final class AmbientPulseManager extends AlertingNotificationManager { 
        for (OnAmbientChangedListener listener : mListeners) {

            listener.onAmbientStateChanged(entry, false);

        }

        entry.row.freeContentViewWhenSafe(FLAG_CONTENT_VIEW_AMBIENT);

    }



    @Override

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

+3 −3
Original line number Diff line number Diff line
@@ -256,9 +256,9 @@ public class NotificationMediaManager implements Dumpable { 


    private boolean isMediaNotification(NotificationData.Entry entry) {

        // TODO: confirm that there's a valid media key

        return entry.getExpandedContentView() != null &&

                entry.getExpandedContentView()

                        .findViewById(com.android.internal.R.id.media_actions) != null;

        return entry.row.getExpandedContentView() != null

                && entry.row.getExpandedContentView().findViewById(

                        com.android.internal.R.id.media_actions) != null;

    }



    private void clearCurrentMediaNotificationSession() {

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationData.java

+0 −14
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import android.util.ArrayMap; 
import android.util.ArraySet;

import android.view.View;

import android.widget.ImageView;

import android.widget.RemoteViews;



import androidx.annotation.Nullable;
@@ -102,11 +101,6 @@ public class NotificationData { 
        public boolean autoRedacted; // whether the redacted notification was generated by us

        public int targetSdk;

        private long lastFullScreenIntentLaunchTime = NOT_LAUNCHED_YET;

        public RemoteViews cachedContentView;

        public RemoteViews cachedBigContentView;

        public RemoteViews cachedHeadsUpContentView;

        public RemoteViews cachedPublicContentView;

        public RemoteViews cachedAmbientContentView;

        public CharSequence remoteInputText;

        public List<SnoozeCriterion> snoozeCriteria;

        public int userSentiment = Ranking.USER_SENTIMENT_NEUTRAL;
@@ -178,14 +172,6 @@ public class NotificationData { 
            }

        }



        public View getExpandedContentView() {

            return row.getPrivateLayout().getExpandedChild();

        }



        public View getPublicContentView() {

            return row.getPublicLayout().getContractedChild();

        }



        public void notifyFullScreenIntentLaunched() {

            setInterruption();

            lastFullScreenIntentLaunchTime = SystemClock.elapsedRealtime();

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java

+42 −10
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ package com.android.systemui.statusbar.notification; 
import static com.android.systemui.statusbar.NotificationRemoteInputManager.ENABLE_REMOTE_INPUT;

import static com.android.systemui.statusbar.NotificationRemoteInputManager

        .FORCE_REMOTE_INPUT_HISTORY;

import static com.android.systemui.statusbar.notification.row.NotificationInflater

        .FLAG_CONTENT_VIEW_AMBIENT;

import static com.android.systemui.statusbar.notification.row.NotificationInflater

        .FLAG_CONTENT_VIEW_HEADS_UP;



import android.annotation.Nullable;

import android.app.Notification;
@@ -71,6 +75,7 @@ import com.android.systemui.statusbar.NotificationRemoteInputManager; 
import com.android.systemui.statusbar.NotificationUiAdjustment;

import com.android.systemui.statusbar.NotificationUpdateHandler;

import com.android.systemui.statusbar.notification.row.NotificationInflater;

import com.android.systemui.statusbar.notification.row.NotificationInflater.InflationFlag;

import com.android.systemui.statusbar.notification.row.RowInflaterTask;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;
@@ -440,25 +445,48 @@ public class NotificationEntryManager implements Dumpable, NotificationInflater. 
    }



    private void addEntry(NotificationData.Entry shadeEntry) {

        if (shouldHeadsUp(shadeEntry)) {

            mHeadsUpManager.showNotification(shadeEntry);

        addNotificationViews(shadeEntry);

        mCallback.onNotificationAdded(shadeEntry);

    }



    /**

     * Adds the entry to the respective alerting manager if the content view was inflated and

     * the entry should still alert.

     *

     * @param entry entry to add

     * @param inflatedFlags flags representing content views that were inflated

     */

    private void showAlertingView(NotificationData.Entry entry,

            @InflationFlag int inflatedFlags) {

        if ((inflatedFlags & FLAG_CONTENT_VIEW_HEADS_UP) != 0) {

            // Possible for shouldHeadsUp to change between the inflation starting and ending.

            // If it does and we no longer need to heads up, we should free the view.

            if (shouldHeadsUp(entry)) {

                mHeadsUpManager.showNotification(entry);

                // Mark as seen immediately

            setNotificationShown(shadeEntry.notification);

                setNotificationShown(entry.notification);

            } else {

                entry.row.freeContentViewWhenSafe(FLAG_CONTENT_VIEW_HEADS_UP);

            }

        }

        if ((inflatedFlags & FLAG_CONTENT_VIEW_AMBIENT) != 0) {

            if (shouldPulse(entry)) {

                mAmbientPulseManager.showNotification(entry);

            } else {

                entry.row.freeContentViewWhenSafe(FLAG_CONTENT_VIEW_AMBIENT);

            }

        if (shouldPulse(shadeEntry)) {

            mAmbientPulseManager.showNotification(shadeEntry);

        }

        addNotificationViews(shadeEntry);

        mCallback.onNotificationAdded(shadeEntry);

    }



    @Override

    public void onAsyncInflationFinished(NotificationData.Entry entry) {

    public void onAsyncInflationFinished(NotificationData.Entry entry,

            @InflationFlag int inflatedFlags) {

        mPendingNotifications.remove(entry.key);

        // If there was an async task started after the removal, we don't want to add it back to

        // the list, otherwise we might get leaks.

        boolean isNew = mNotificationData.get(entry.key) == null;

        if (isNew && !entry.row.isRemoved()) {

            showAlertingView(entry, inflatedFlags);

            addEntry(entry);

        } else if (!isNew && entry.row.hasLowPriorityStateUpdated()) {

            mVisualStabilityManager.onLowPriorityUpdated(entry);
@@ -636,7 +664,11 @@ public class NotificationEntryManager implements Dumpable, NotificationInflater. 
        row.setUseIncreasedCollapsedHeight(useIncreasedCollapsedHeight);

        row.setUseIncreasedHeadsUpHeight(useIncreasedHeadsUp);

        row.setSmartActions(entry.smartActions);

        row.updateNotification(entry);

        row.setEntry(entry);



        row.updateInflationFlag(FLAG_CONTENT_VIEW_HEADS_UP, shouldHeadsUp(entry));

        row.updateInflationFlag(FLAG_CONTENT_VIEW_AMBIENT, shouldPulse(entry));

        row.inflateViews();

    }



    protected void addNotificationViews(NotificationData.Entry entry) {

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

+62 −3
Original line number Diff line number Diff line
@@ -17,12 +17,19 @@ 
package com.android.systemui.statusbar.notification.row;



import static com.android.systemui.statusbar.notification.ActivityLaunchAnimator.ExpandAnimationParameters;

import static com.android.systemui.statusbar.notification.row.NotificationContentView.VISIBLE_TYPE_AMBIENT;

import static com.android.systemui.statusbar.notification.row.NotificationContentView.VISIBLE_TYPE_HEADSUP;

import static com.android.systemui.statusbar.notification.row.NotificationInflater

        .FLAG_CONTENT_VIEW_AMBIENT;

import static com.android.systemui.statusbar.notification.row.NotificationInflater

        .FLAG_CONTENT_VIEW_HEADS_UP;

import static com.android.systemui.statusbar.notification.row.NotificationInflater.InflationCallback;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.ObjectAnimator;

import android.animation.ValueAnimator.AnimatorUpdateListener;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.Notification;

import android.app.NotificationChannel;
@@ -83,6 +90,7 @@ import com.android.systemui.statusbar.notification.AboveShelfChangedListener; 
import com.android.systemui.statusbar.notification.ActivityLaunchAnimator;

import com.android.systemui.statusbar.notification.logging.NotificationCounters;

import com.android.systemui.statusbar.notification.NotificationUtils;

import com.android.systemui.statusbar.notification.row.NotificationInflater.InflationFlag;

import com.android.systemui.statusbar.notification.row.wrapper.NotificationViewWrapper;

import com.android.systemui.statusbar.notification.VisualStabilityManager;

import com.android.systemui.statusbar.phone.NotificationGroupManager;
@@ -429,12 +437,59 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        }

    }



    public void updateNotification(NotificationData.Entry entry) {

    /**

     * Set the entry for the row.

     *

     * @param entry the entry this row is tied to

     */

    public void setEntry(@NonNull NotificationData.Entry entry) {

        mEntry = entry;

        mStatusBarNotification = entry.notification;

        cacheIsSystemNotification();

    }



    /**

     * Inflate views based off the inflation flags set.  Inflation happens asynchronously.

     */

    public void inflateViews() {

        mNotificationInflater.inflateNotificationViews();

    }



        cacheIsSystemNotification();

    /**

     * Marks a content view as freeable, setting it so that future inflations do not reinflate

     * and ensuring that the view is freed when it is safe to remove.

     *

     * @param inflationFlag flag corresponding to the content view to be freed

     */

    public void freeContentViewWhenSafe(@InflationFlag int inflationFlag) {

        // View should not be reinflated in the future

        updateInflationFlag(inflationFlag, false);

        Runnable freeViewRunnable = () ->

                mNotificationInflater.freeNotificationView(inflationFlag);

        switch (inflationFlag) {

            case FLAG_CONTENT_VIEW_HEADS_UP:

                getPrivateLayout().performWhenContentInactive(VISIBLE_TYPE_HEADSUP,

                        freeViewRunnable);

                break;

            case FLAG_CONTENT_VIEW_AMBIENT:

                getPrivateLayout().performWhenContentInactive(VISIBLE_TYPE_AMBIENT,

                        freeViewRunnable);

                getPublicLayout().performWhenContentInactive(VISIBLE_TYPE_AMBIENT,

                        freeViewRunnable);

                break;

            default:

                break;

        }

    }



    /**

     * Update whether or not a content view should be inflated.

     *

     * @param flag the flag corresponding to the content view

     * @param shouldInflate true if it should be inflated, false if it should not

     */

    public void updateInflationFlag(@InflationFlag int flag, boolean shouldInflate) {

        mNotificationInflater.updateInflationFlag(flag, shouldInflate);

    }



    /**
@@ -581,7 +636,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
            headsUpHeight = mMaxHeadsUpHeight;

        }

        NotificationViewWrapper headsUpWrapper = layout.getVisibleWrapper(

                NotificationContentView.VISIBLE_TYPE_HEADSUP);

                VISIBLE_TYPE_HEADSUP);

        if (headsUpWrapper != null) {

            headsUpHeight = Math.max(headsUpHeight, headsUpWrapper.getMinLayoutHeight());

        }
@@ -2616,6 +2671,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        return shouldShowPublic() ? mPublicLayout : mPrivateLayout;

    }



    public View getExpandedContentView() {

        return getPrivateLayout().getExpandedChild();

    }



    public void setLegacy(boolean legacy) {

        for (NotificationContentView l : mLayouts) {

            l.setLegacy(legacy);