Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not translate statusbar icons" into qt-dev

Browse Source 
am: 47e4102e9f

Change-Id: Ib4d9291229c735af19e53cee5e1ebe4fd2667030
This commit is contained in:
Lucas Dupin
2019-05-31 07:58:44 -07:00
committed by android-build-merger
parent 69b2cdd42e 47e4102e9f
commit cf02743de1
2 changed files with 0 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
View File

@@ -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;

1
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -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();
}