diff options
5 files changed, 19 insertions, 18 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/AlertingNotificationManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/AlertingNotificationManager.java index faffb3e118fc..81629de9bff9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/AlertingNotificationManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/AlertingNotificationManager.java @@ -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 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java index cec76f3140cd..7e696d23fa41 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java @@ -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; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/AlertingNotificationManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/AlertingNotificationManagerTest.java index b98dc0016066..f9cbeca08bd4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/AlertingNotificationManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/AlertingNotificationManagerTest.java @@ -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 diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhoneTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhoneTest.java index 48b95d407246..d6ae0703f444 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhoneTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhoneTest.java @@ -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; } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HeadsUpManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HeadsUpManagerTest.java index 4f3f56423eb0..c35080691f61 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HeadsUpManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HeadsUpManagerTest.java @@ -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. |