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

Commit bf70bb64 authored by Julia Tuttle's avatar Julia Tuttle
Browse files

Fix some misspelled/confusing names in AlertingNotificationManager 

Bug: 315192399
Test: atest AlertingNotificationManagerTest
Test: atest HeadsUpManagerTest
Test: atest HeadsUpManagerPhoneTest
Flag: NA
Change-Id: I5f46c5d57b519f7f9a01b224aa25645a6582eba4
parent 87852020

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

+8 −8
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ public abstract class AlertingNotificationManager { 
    }



    protected int mMinimumDisplayTime;

    protected int mStickyDisplayTime;

    protected int mAutoDismissNotificationDecay;

    protected int mStickyForSomeTimeAutoDismissTime;

    protected int mAutoDismissTime;

    @VisibleForTesting

    public Handler mHandler;
@@ -251,7 +251,7 @@ public abstract class AlertingNotificationManager { 
    public long getEarliestRemovalTime(String key) {

        AlertEntry alerting = mAlertEntries.get(key);

        if (alerting != null) {

            return Math.max(0, alerting.mEarliestRemovaltime - mClock.currentTimeMillis());

            return Math.max(0, alerting.mEarliestRemovalTime - mClock.currentTimeMillis());

        }

        return 0;

    }
@@ -259,7 +259,7 @@ public abstract class AlertingNotificationManager { 
    protected class AlertEntry implements Comparable<AlertEntry> {

        @Nullable public NotificationEntry mEntry;

        public long mPostTime;

        public long mEarliestRemovaltime;

        public long mEarliestRemovalTime;



        @Nullable protected Runnable mRemoveAlertRunnable;
@@ -284,7 +284,7 @@ public abstract class AlertingNotificationManager { 
            mLogger.logUpdateEntry(mEntry, updatePostTime, reason);



            final long now = mClock.currentTimeMillis();

            mEarliestRemovaltime = now + mMinimumDisplayTime;

            mEarliestRemovalTime = now + mMinimumDisplayTime;



            if (updatePostTime) {

                mPostTime = Math.max(mPostTime, now);
@@ -318,7 +318,7 @@ public abstract class AlertingNotificationManager { 
         * @return true if the notification has been on screen long enough

         */

        public boolean wasShownLongEnough() {

            return mEarliestRemovaltime < mClock.currentTimeMillis();

            return mEarliestRemovalTime < mClock.currentTimeMillis();

        }



        @Override
@@ -351,7 +351,7 @@ public abstract class AlertingNotificationManager { 
            if (mRemoveAlertRunnable != null) {

                removeAutoRemovalCallbacks("removeAsSoonAsPossible (will be rescheduled)");



                final long timeLeft = mEarliestRemovaltime - mClock.currentTimeMillis();

                final long timeLeft = mEarliestRemovalTime - mClock.currentTimeMillis();

                mHandler.postDelayed(mRemoveAlertRunnable, timeLeft);

            }

        }
@@ -366,7 +366,7 @@ public abstract class AlertingNotificationManager { 


        /**

         * @return When the notification should auto-dismiss itself, based on

         * {@link SystemClock#elapsedRealTime()}

         * {@link SystemClock#elapsedRealtime()}

         */

        protected long calculateFinishTime() {

            // Overridden by HeadsUpManager HeadsUpEntry #calculateFinishTime

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

+5 −4
Original line number Diff line number Diff line
@@ -93,8 +93,9 @@ public abstract class BaseHeadsUpManager extends AlertingNotificationManager imp 
        mUiEventLogger = uiEventLogger;

        Resources resources = context.getResources();

        mMinimumDisplayTime = resources.getInteger(R.integer.heads_up_notification_minimum_time);

        mStickyDisplayTime = resources.getInteger(R.integer.sticky_heads_up_notification_time);

        mAutoDismissNotificationDecay = resources.getInteger(R.integer.heads_up_notification_decay);

        mStickyForSomeTimeAutoDismissTime = resources.getInteger(

                R.integer.sticky_heads_up_notification_time);

        mAutoDismissTime = resources.getInteger(R.integer.heads_up_notification_decay);

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

        mSnoozedPackages = new ArrayMap<>();

        int defaultSnoozeLengthMs =
@@ -519,12 +520,12 @@ public abstract class BaseHeadsUpManager extends AlertingNotificationManager imp 


        /**

         * @return When the notification should auto-dismiss itself, based on

         * {@link SystemClock#elapsedRealTime()}

         * {@link SystemClock#elapsedRealtime()}

         */

        @Override

        protected long calculateFinishTime() {

            final long duration = getRecommendedHeadsUpTimeoutMs(

                    isStickyForSomeTime() ? mStickyDisplayTime : mAutoDismissNotificationDecay);

                    isStickyForSomeTime() ? mStickyForSomeTimeAutoDismissTime : mAutoDismissTime);



            return mPostTime + duration;

        }

packages/SystemUI/tests/src/com/android/systemui/statusbar/AlertingNotificationManagerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ import android.testing.TestableLooper; 


import androidx.test.filters.SmallTest;



import com.android.systemui.res.R;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
@@ -84,8 +84,8 @@ public class AlertingNotificationManagerTest extends SysuiTestCase { 
        private TestableAlertingNotificationManager(Handler handler) {

            super(new HeadsUpManagerLogger(logcatLogBuffer()), handler);

            mMinimumDisplayTime = TEST_MINIMUM_DISPLAY_TIME;

            mAutoDismissNotificationDecay = TEST_AUTO_DISMISS_TIME;

            mStickyDisplayTime = TEST_STICKY_AUTO_DISMISS_TIME;

            mAutoDismissTime = TEST_AUTO_DISMISS_TIME;

            mStickyForSomeTimeAutoDismissTime = TEST_STICKY_AUTO_DISMISS_TIME;

        }



        @Override

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhoneTest.java

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ public class HeadsUpManagerPhoneTest extends AlertingNotificationManagerTest { 
                    shadeInteractor

            );

            mMinimumDisplayTime = TEST_MINIMUM_DISPLAY_TIME;

            mAutoDismissNotificationDecay = TEST_AUTO_DISMISS_TIME;

            mAutoDismissTime = TEST_AUTO_DISMISS_TIME;

        }

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HeadsUpManagerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ public class HeadsUpManagerTest extends AlertingNotificationManagerTest { 
            super(context, logger, handler, accessibilityManagerWrapper, uiEventLogger);

            mTouchAcceptanceDelay = TEST_TOUCH_ACCEPTANCE_TIME;

            mMinimumDisplayTime = TEST_MINIMUM_DISPLAY_TIME;

            mAutoDismissNotificationDecay = TEST_AUTO_DISMISS_TIME;

            mStickyDisplayTime = TEST_STICKY_AUTO_DISMISS_TIME;

            mAutoDismissTime = TEST_AUTO_DISMISS_TIME;

            mStickyForSomeTimeAutoDismissTime = TEST_STICKY_AUTO_DISMISS_TIME;

        }



        // The following are only implemented by HeadsUpManagerPhone. If you need them, use that.