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

Commit f04f3bdf authored by Lyn's avatar Lyn
Browse files

Rename BaseHeadsUpManager runnables without reference to alerting 

Bug: 320753095
Test: SystemUITests
Flag: none

Change-Id: I81a559417b396f7e90f1c3a243c560cadb950b11
parent e4e119c1

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

+11 −11
Original line number Diff line number Diff line
@@ -650,18 +650,18 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager { 
        public long mPostTime;

        public long mEarliestRemovalTime;



        @Nullable protected Runnable mRemoveAlertRunnable;

        @Nullable protected Runnable mRemoveRunnable;



        @Nullable private Runnable mCancelRemoveAlertRunnable;

        @Nullable private Runnable mCancelRemoveRunnable;



        public void setEntry(@NonNull final NotificationEntry entry) {

            setEntry(entry, () -> removeEntry(entry.getKey()));

        }



        public void setEntry(@NonNull final NotificationEntry entry,

                @Nullable Runnable removeAlertRunnable) {

                @Nullable Runnable removeRunnable) {

            mEntry = entry;

            mRemoveAlertRunnable = removeAlertRunnable;

            mRemoveRunnable = removeRunnable;



            mPostTime = calculatePostTime();

            updateEntry(true /* updatePostTime */, "setEntry");
@@ -761,7 +761,7 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager { 
        public void reset() {

            removeAutoRemovalCallbacks("reset()");

            mEntry = null;

            mRemoveAlertRunnable = null;

            mRemoveRunnable = null;

            mExpanded = false;

            mRemoteInputActive = false;

        }
@@ -778,7 +778,7 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager { 
        }



        public void scheduleAutoRemovalCallback(long delayMillis, @NonNull String reason) {

            if (mRemoveAlertRunnable == null) {

            if (mRemoveRunnable == null) {

                Log.wtf(TAG, "scheduleAutoRemovalCallback with no callback set");

                return;

            }
@@ -791,16 +791,16 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager { 
                mLogger.logAutoRemoveScheduled(mEntry, delayMillis, reason);

            }



            mCancelRemoveAlertRunnable = mExecutor.executeDelayed(mRemoveAlertRunnable,

            mCancelRemoveRunnable = mExecutor.executeDelayed(mRemoveRunnable,

                    delayMillis);

        }



        public boolean removeAutoRemovalCallbackInternal() {

            final boolean scheduled = (mCancelRemoveAlertRunnable != null);

            final boolean scheduled = (mCancelRemoveRunnable != null);



            if (scheduled) {

                mCancelRemoveAlertRunnable.run();

                mCancelRemoveAlertRunnable = null;

                mCancelRemoveRunnable.run();

                mCancelRemoveRunnable = null;

            }



            return scheduled;
@@ -810,7 +810,7 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager { 
         * Remove the entry at the earliest allowed removal time.

         */

        public void removeAsSoonAsPossible() {

            if (mRemoveAlertRunnable != null) {

            if (mRemoveRunnable != null) {

                final long timeLeft = mEarliestRemovalTime - mSystemClock.elapsedRealtime();

                scheduleAutoRemovalCallback(timeLeft, "removeAsSoonAsPossible");

            }