From 37a0e9c87edfc9b45ede85d0333f8fb509a4a603 Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Tue, 11 Feb 2025 20:10:35 -0500 Subject: [sb] udpate mobile type icons RAT indicator icons for frameworks/base. This change lands a set of *_updated.xml icons, and configures the mobile view for the new dimensions. Test: not yet Bug: 391606042 Flag: com.android.settingslib.flags.new_status_bar_icons Change-Id: I7b49bbfc26b4814982a9e363ac1c5ad32ccc9ef6 --- .../android/settingslib/mobile/TelephonyIcons.java | 58 ++++++++++++++++------ 1 file changed, 42 insertions(+), 16 deletions(-) (limited to 'packages/SettingsLib/src') diff --git a/packages/SettingsLib/src/com/android/settingslib/mobile/TelephonyIcons.java b/packages/SettingsLib/src/com/android/settingslib/mobile/TelephonyIcons.java index 094567c400a3..9ca46238c2ce 100644 --- a/packages/SettingsLib/src/com/android/settingslib/mobile/TelephonyIcons.java +++ b/packages/SettingsLib/src/com/android/settingslib/mobile/TelephonyIcons.java @@ -18,6 +18,7 @@ package com.android.settingslib.mobile; import com.android.settingslib.R; import com.android.settingslib.SignalIcon.MobileIconGroup; +import com.android.settingslib.flags.Flags; import java.util.HashMap; import java.util.Map; @@ -29,22 +30,47 @@ public class TelephonyIcons { //***** Data connection icons public static final int FLIGHT_MODE_ICON = R.drawable.stat_sys_airplane_mode; - public static final int ICON_LTE = R.drawable.ic_lte_mobiledata; - public static final int ICON_LTE_PLUS = R.drawable.ic_lte_plus_mobiledata; - public static final int ICON_G = R.drawable.ic_g_mobiledata; - public static final int ICON_E = R.drawable.ic_e_mobiledata; - public static final int ICON_H = R.drawable.ic_h_mobiledata; - public static final int ICON_H_PLUS = R.drawable.ic_h_plus_mobiledata; - public static final int ICON_3G = R.drawable.ic_3g_mobiledata; - public static final int ICON_4G = R.drawable.ic_4g_mobiledata; - public static final int ICON_4G_PLUS = R.drawable.ic_4g_plus_mobiledata; - public static final int ICON_4G_LTE = R.drawable.ic_4g_lte_mobiledata; - public static final int ICON_4G_LTE_PLUS = R.drawable.ic_4g_lte_plus_mobiledata; - public static final int ICON_5G_E = R.drawable.ic_5g_e_mobiledata; - public static final int ICON_1X = R.drawable.ic_1x_mobiledata; - public static final int ICON_5G = R.drawable.ic_5g_mobiledata; - public static final int ICON_5G_PLUS = R.drawable.ic_5g_plus_mobiledata; - public static final int ICON_CWF = R.drawable.ic_carrier_wifi; + public static final int ICON_LTE = + flagged(R.drawable.ic_lte_mobiledata, R.drawable.ic_lte_mobiledata_updated); + public static final int ICON_LTE_PLUS = + flagged(R.drawable.ic_lte_plus_mobiledata, R.drawable.ic_lte_plus_mobiledata_updated); + public static final int ICON_G = + flagged(R.drawable.ic_g_mobiledata, R.drawable.ic_g_mobiledata_updated); + public static final int ICON_E = + flagged(R.drawable.ic_e_mobiledata, R.drawable.ic_e_mobiledata_updated); + public static final int ICON_H = + flagged(R.drawable.ic_h_mobiledata, R.drawable.ic_h_mobiledata_updated); + public static final int ICON_H_PLUS = + flagged(R.drawable.ic_h_plus_mobiledata, R.drawable.ic_h_plus_mobiledata_updated); + public static final int ICON_3G = + flagged(R.drawable.ic_3g_mobiledata, R.drawable.ic_3g_mobiledata_updated); + public static final int ICON_4G = + flagged(R.drawable.ic_4g_mobiledata, R.drawable.ic_4g_mobiledata_updated); + public static final int ICON_4G_PLUS = + flagged(R.drawable.ic_4g_plus_mobiledata, R.drawable.ic_4g_plus_mobiledata_updated); + public static final int ICON_4G_LTE = + flagged(R.drawable.ic_4g_lte_mobiledata, R.drawable.ic_4g_lte_mobiledata_updated); + public static final int ICON_4G_LTE_PLUS = + flagged(R.drawable.ic_4g_lte_plus_mobiledata, + R.drawable.ic_4g_lte_plus_mobiledata_updated); + public static final int ICON_5G_E = + flagged(R.drawable.ic_5g_e_mobiledata, R.drawable.ic_5g_e_mobiledata_updated); + public static final int ICON_1X = + flagged(R.drawable.ic_1x_mobiledata, R.drawable.ic_1x_mobiledata_updated); + public static final int ICON_5G = + flagged(R.drawable.ic_5g_mobiledata, R.drawable.ic_5g_mobiledata_updated); + public static final int ICON_5G_PLUS = + flagged(R.drawable.ic_5g_plus_mobiledata, R.drawable.ic_5g_plus_mobiledata_updated); + public static final int ICON_CWF = + flagged(R.drawable.ic_carrier_wifi, R.drawable.ic_carrier_wifi_updated); + + /** Make it slightly more obvious which resource we are using */ + private static int flagged(int oldIcon, int newIcon) { + if (Flags.newStatusBarIcons()) { + return newIcon; + } + return oldIcon; + } public static final MobileIconGroup CARRIER_NETWORK_CHANGE = new MobileIconGroup( "CARRIER_NETWORK_CHANGE", -- cgit v1.2.3-59-g8ed1b