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

chore(non linear font scaling): remove mAlwaysScaleIcon in StatusBarIconView am: c7f002fd68

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23662313

Change-Id: Ia7183c76bcd0099d2d3f150ab1df49c84cbe31b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Roy Chou
2023-07-11 06:50:35 +00:00
committed by Automerger Merge Worker
parent a8386a6b70 c7f002fd68
commit 4424d981eb
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
View File

@@ -41,7 +41,6 @@ import android.os.Trace;
import android.os.UserHandle; import android.os.UserHandle;
import android.service.notification.StatusBarNotification; import android.service.notification.StatusBarNotification;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.FloatProperty; import android.util.FloatProperty;
import android.util.Log; import android.util.Log;
import android.util.Property; import android.util.Property;
@@ -131,7 +130,6 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
} }
}; };
private boolean mAlwaysScaleIcon;
private int mStatusBarIconDrawingSizeIncreased = 1; private int mStatusBarIconDrawingSizeIncreased = 1;
private int mStatusBarIconDrawingSize = 1; private int mStatusBarIconDrawingSize = 1;
private int mStatusBarIconSize = 1; private int mStatusBarIconSize = 1;
@@ -207,21 +205,11 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
maybeUpdateIconScaleDimens(); maybeUpdateIconScaleDimens();
} }
public StatusBarIconView(Context context, AttributeSet attrs) {
super(context, attrs);
mDozer = new NotificationIconDozeHelper(context);
mBlocked = false;
mAlwaysScaleIcon = true;
reloadDimens();
maybeUpdateIconScaleDimens();
mDensity = context.getResources().getDisplayMetrics().densityDpi;
}
/** Should always be preceded by {@link #reloadDimens()} */ /** Should always be preceded by {@link #reloadDimens()} */
private void maybeUpdateIconScaleDimens() { private void maybeUpdateIconScaleDimens() {
// We do not resize and scale system icons (on the right), only notification icons (on the // We do not resize and scale system icons (on the right), only notification icons (on the
// left). // left).
if (mNotification != null || mAlwaysScaleIcon) { if (isNotification()) {
updateIconScaleForNotifications(); updateIconScaleForNotifications();
} else { } else {
updateIconScaleForSystemIcons(); updateIconScaleForSystemIcons();
@@ -309,6 +297,10 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
maybeUpdateIconScaleDimens(); maybeUpdateIconScaleDimens();
} }
private boolean isNotification() {
return mNotification != null;
}
private static boolean streq(String a, String b) { private static boolean streq(String a, String b) {
if (a == b) { if (a == b) {
return true; return true;
@@ -416,7 +408,7 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
Drawable getIcon(StatusBarIcon icon) { Drawable getIcon(StatusBarIcon icon) {
Context notifContext = getContext(); Context notifContext = getContext();
if (mNotification != null) { if (isNotification()) {
notifContext = mNotification.getPackageContext(getContext()); notifContext = mNotification.getPackageContext(getContext());
} }
return getIcon(getContext(), notifContext != null ? notifContext : getContext(), icon); return getIcon(getContext(), notifContext != null ? notifContext : getContext(), icon);
@@ -471,7 +463,7 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
@Override @Override
public void onInitializeAccessibilityEvent(AccessibilityEvent event) { public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
super.onInitializeAccessibilityEvent(event); super.onInitializeAccessibilityEvent(event);
if (mNotification != null) { if (isNotification()) {
event.setParcelableData(mNotification.getNotification()); event.setParcelableData(mNotification.getNotification());
} }
} }
@@ -624,7 +616,7 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
} }
private void initializeDecorColor() { private void initializeDecorColor() {
if (mNotification != null) { if (isNotification()) {
setDecorColor(getContext().getColor(mNightMode setDecorColor(getContext().getColor(mNightMode
? com.android.internal.R.color.notification_default_color_dark ? com.android.internal.R.color.notification_default_color_dark
: com.android.internal.R.color.notification_default_color_light)); : com.android.internal.R.color.notification_default_color_light));