Merge "Use emphasized font for global actions" into main (93e781d5) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -307,6 +307,16 @@ flag {
		bug: "311147395"
		}

		flag {
		name: "global_actions_emphasized_font"
		namespace: "systemui"
		description: "Use emphasized font for global actions."
		bug: "393616338"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "coroutine_tracing"
		namespace: "systemui"

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java

+21 −3

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ import android.content.res.Configuration;
		import android.content.res.Resources;
		import android.database.ContentObserver;
		import android.graphics.Color;
		import android.graphics.Typeface;
		import android.graphics.drawable.Drawable;
		import android.media.AudioManager;
		import android.os.Binder;
		@@ -115,6 +116,8 @@ import com.android.internal.util.EmergencyAffordanceManager;
		import com.android.internal.util.ScreenshotHelper;
		import com.android.internal.widget.LockPatternUtils;
		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.systemui.Flags;
		import com.android.systemui.FontStyles;
		import com.android.systemui.MultiListLayout;
		import com.android.systemui.MultiListLayout.MultiListAdapter;
		import com.android.systemui.animation.DialogCuj;
		@@ -136,7 +139,7 @@ import com.android.systemui.settings.UserTracker;
		import com.android.systemui.shade.ShadeController;
		import com.android.systemui.shade.ShadeDisplayAware;
		import com.android.systemui.shade.shared.flag.ShadeWindowGoesAround;
		import com.android.systemui.topui.TopUiController;
		import com.android.systemui.statusbar.NotificationShadeWindowController;
		import com.android.systemui.statusbar.VibratorHelper;
		import com.android.systemui.statusbar.phone.LightBarController;
		import com.android.systemui.statusbar.phone.SystemUIDialog;
		@@ -145,6 +148,7 @@ import com.android.systemui.statusbar.policy.KeyguardStateController;
		import com.android.systemui.statusbar.window.StatusBarWindowController;
		import com.android.systemui.statusbar.window.StatusBarWindowControllerStore;
		import com.android.systemui.telephony.TelephonyListenerManager;
		import com.android.systemui.topui.TopUiController;
		import com.android.systemui.user.domain.interactor.SelectedUserInteractor;
		import com.android.systemui.user.domain.interactor.UserLogoutInteractor;
		import com.android.systemui.util.EmergencyDialerConstants;
		@@ -1700,7 +1704,10 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
		ImageView icon = view.findViewById(R.id.icon);
		TextView messageView = view.findViewById(R.id.message);
		messageView.setSelected(true); // necessary for marquee to work

		if (Flags.globalActionsEmphasizedFont()) {
		messageView.setTypeface(
		Typeface.create(FontStyles.GSF_LABEL_LARGE_EMPHASIZED, Typeface.NORMAL));
		}
		icon.setImageDrawable(action.getIcon(mContext));
		icon.setScaleType(ScaleType.CENTER_CROP);

		@@ -1781,6 +1788,10 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
		} else {
		textView.setText(action.getMessage());
		}
		if (Flags.globalActionsEmphasizedFont()) {
		textView.setTypeface(
		Typeface.create(FontStyles.GSF_LABEL_LARGE_EMPHASIZED, Typeface.NORMAL));
		}
		return textView;
		}

		@@ -1973,8 +1984,11 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene

		mIconView = v.findViewById(R.id.icon);
		TextView messageView = v.findViewById(R.id.message);
		if (Flags.globalActionsEmphasizedFont()) {
		messageView.setTypeface(
		Typeface.create(FontStyles.GSF_LABEL_LARGE_EMPHASIZED, Typeface.NORMAL));
		}
		messageView.setSelected(true); // necessary for marquee to work

		mIconView.setImageDrawable(getIcon(context));
		mIconView.setScaleType(ScaleType.CENTER_CROP);
		if (com.android.systemui.Flags.tvGlobalActionsFocus()) {
		@@ -2128,6 +2142,10 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene

		ImageView icon = (ImageView) v.findViewById(R.id.icon);
		TextView messageView = (TextView) v.findViewById(R.id.message);
		if (Flags.globalActionsEmphasizedFont()) {
		messageView.setTypeface(
		Typeface.create(FontStyles.GSF_LABEL_LARGE_EMPHASIZED, Typeface.NORMAL));
		}
		final boolean enabled = isEnabled();

		if (messageView != null) {

packages/SystemUI/src/com/android/systemui/globalactions/ShutdownUi.java

+20 −4

Original line number	Diff line number	Diff line
		@@ -18,10 +18,13 @@ package com.android.systemui.globalactions;

		import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;

		import static com.android.systemui.Flags.globalActionsEmphasizedFont;

		import android.annotation.Nullable;
		import android.annotation.StringRes;
		import android.app.Dialog;
		import android.content.Context;
		import android.graphics.Typeface;
		import android.nearby.NearbyManager;
		import android.net.platform.flags.Flags;
		import android.os.PowerManager;
		@@ -36,6 +39,7 @@ import android.widget.TextView;
		import androidx.annotation.VisibleForTesting;

		import com.android.internal.R;
		import com.android.systemui.FontStyles;
		import com.android.systemui.scrim.ScrimDrawable;

		import javax.inject.Inject;
		@@ -56,6 +60,7 @@ public class ShutdownUi {

		/**
		* Display the shutdown UI.
		*
		* @param isReboot Whether the device will be rebooting after this shutdown.
		* @param reason Cause for the shutdown.
		* @return Shutdown dialog.
		@@ -110,6 +115,13 @@ public class ShutdownUi {
		reasonView.setTextColor(color);
		messageView.setTextColor(color);

		if (globalActionsEmphasizedFont()) {
		Typeface typeface = Typeface.create(FontStyles.GSF_LABEL_LARGE_EMPHASIZED,
		Typeface.NORMAL);
		reasonView.setTypeface(typeface);
		messageView.setTypeface(typeface);
		}

		messageView.setText(getRebootMessage(isReboot, reason));
		String rebootReasonMessage = getReasonMessage(reason);
		if (rebootReasonMessage != null) {
		@@ -124,9 +136,11 @@ public class ShutdownUi {

		/**
		* Returns the layout resource to use for UI while shutting down.
		*
		* @param isReboot Whether this is a reboot or a shutdown.
		*/
		@VisibleForTesting int getShutdownDialogContent(boolean isReboot) {
		@VisibleForTesting
		int getShutdownDialogContent(boolean isReboot) {
		if (!Flags.poweredOffFindingPlatform()) {
		return R.layout.shutdown_dialog;
		}
		@@ -147,7 +161,8 @@ public class ShutdownUi {
		}

		@StringRes
		@VisibleForTesting int getRebootMessage(boolean isReboot, @Nullable String reason) {
		@VisibleForTesting
		int getRebootMessage(boolean isReboot, @Nullable String reason) {
		if (reason != null && reason.startsWith(PowerManager.REBOOT_RECOVERY_UPDATE)) {
		return R.string.reboot_to_update_reboot;
		} else if (reason != null && reason.equals(PowerManager.REBOOT_RECOVERY)) {
		@@ -160,7 +175,8 @@ public class ShutdownUi {
		}

		@Nullable
		@VisibleForTesting String getReasonMessage(@Nullable String reason) {
		@VisibleForTesting
		String getReasonMessage(@Nullable String reason) {
		if (reason != null && reason.startsWith(PowerManager.REBOOT_RECOVERY_UPDATE)) {
		return mContext.getString(R.string.reboot_to_update_title);
		} else if (reason != null && reason.equals(PowerManager.REBOOT_RECOVERY)) {