diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java | 57 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java | 1 |
2 files changed, 0 insertions, 58 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java index bb490f52b045..e8ca3eef24de 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java @@ -1,7 +1,5 @@ package com.android.systemui.statusbar.phone; -import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset; - import android.content.Context; import android.content.res.Resources; import android.graphics.Color; @@ -17,7 +15,6 @@ import androidx.collection.ArrayMap; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.util.ContrastColorUtil; -import com.android.internal.widget.ViewClippingUtil; import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.plugins.DarkIconDispatcher; @@ -86,17 +83,6 @@ public class NotificationIconAreaController implements DarkReceiver, * Ratio representing being awake or in ambient mode, where 1 is dark and 0 awake. */ private float mDarkAmount; - /** - * Maximum translation to avoid burn in. - */ - private int mBurnInOffset; - /** - * Height of the keyguard status bar (not the one after unlocking.) - */ - private int mKeyguardStatusBarHeight; - - private final ViewClippingUtil.ClippingParameters mClippingParameters = - view -> view instanceof StatusBarWindowView; public NotificationIconAreaController(Context context, StatusBar statusBar, StatusBarStateController statusBarStateController, @@ -166,9 +152,6 @@ public class NotificationIconAreaController implements DarkReceiver, Resources res = context.getResources(); mIconSize = res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_icon_size); mIconHPadding = res.getDimensionPixelSize(R.dimen.status_bar_icon_padding); - mBurnInOffset = res.getDimensionPixelSize(R.dimen.default_burn_in_prevention_offset); - mKeyguardStatusBarHeight = res - .getDimensionPixelSize(R.dimen.status_bar_header_height_keyguard); } /** @@ -479,49 +462,9 @@ public class NotificationIconAreaController implements DarkReceiver, mNotificationIcons.setIsolatedIconLocation(iconDrawingRect, requireStateUpdate); } - /** - * Moves icons whenever the device wakes up in AOD, to avoid burn in. - */ - public void dozeTimeTick() { - if (mNotificationIcons.getVisibility() != View.VISIBLE) { - return; - } - - if (mDarkAmount == 0 && !mStatusBarStateController.isDozing()) { - mNotificationIcons.setTranslationX(0); - mNotificationIcons.setTranslationY(0); - mCenteredIcon.setTranslationX(0); - mCenteredIcon.setTranslationY(0); - return; - } - - int yOffset = (mKeyguardStatusBarHeight - getHeight()) / 2; - int translationX = getBurnInOffset(mBurnInOffset, true /* xAxis */); - int translationY = getBurnInOffset(mBurnInOffset, false /* xAxis */) + yOffset; - mNotificationIcons.setTranslationX(translationX); - mNotificationIcons.setTranslationY(translationY); - mCenteredIcon.setTranslationX(translationX); - mCenteredIcon.setTranslationY(translationY); - } - - @Override - public void onDozingChanged(boolean isDozing) { - dozeTimeTick(); - } - @Override public void onDozeAmountChanged(float linear, float eased) { - boolean wasOrIsAwake = mDarkAmount == 0 || linear == 0; - boolean wasOrIsDozing = mDarkAmount == 1 || linear == 1; mDarkAmount = linear; - if (wasOrIsAwake) { - ViewClippingUtil.setClippingDeactivated(mNotificationIcons, mDarkAmount != 0, - mClippingParameters); - } - if (wasOrIsAwake || wasOrIsDozing) { - dozeTimeTick(); - } - boolean fullyDark = mDarkAmount == 1f; if (mFullyDark != fullyDark) { mFullyDark = fullyDark; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 4e8f58413303..131db75735bc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -4012,7 +4012,6 @@ public class StatusBar extends SystemUI implements DemoMode, @Override public void dozeTimeTick() { mNotificationPanel.dozeTimeTick(); - mNotificationIconAreaController.dozeTimeTick(); if (mAmbientIndicationContainer instanceof DozeReceiver) { ((DozeReceiver) mAmbientIndicationContainer).dozeTimeTick(); } |