From 4e9a675ca64f0acfd5a269e7d0e8ed861131a475 Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Thu, 26 Aug 2021 12:25:12 -0400 Subject: [PATCH] Remove isWide from MobileIconGroup This field was unused Bug: 197851948 Test: atest SystemUITests Change-Id: I116b5f639f601a99349ec60246f42d1f8ab83c6d --- .../com/android/settingslib/SignalIcon.java | 4 +- .../settingslib/mobile/TelephonyIcons.java | 122 ++++++++++-------- .../policy/MobileSignalController.java | 4 +- .../statusbar/policy/NetworkController.java | 5 +- .../policy/WifiSignalController.java | 2 +- .../carrier/QSCarrierGroupControllerTest.java | 2 +- .../statusbar/policy/CallbackHandlerTest.java | 3 +- 7 files changed, 77 insertions(+), 65 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java b/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java index bc0c6f36e96ad..aba06056dd34d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java +++ b/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java @@ -139,17 +139,15 @@ public class SignalIcon { public static class MobileIconGroup extends IconGroup { public final int dataContentDescription; // mContentDescriptionDataType public final int dataType; - public final boolean isWide; public final int qsDataType; public MobileIconGroup(String name, int[][] sbIcons, int[][] qsIcons, int[] contentDesc, int sbNullState, int qsNullState, int sbDiscState, int qsDiscState, - int discContentDesc, int dataContentDesc, int dataType, boolean isWide) { + int discContentDesc, int dataContentDesc, int dataType) { super(name, sbIcons, qsIcons, contentDesc, sbNullState, qsNullState, sbDiscState, qsDiscState, discContentDesc); this.dataContentDescription = dataContentDesc; this.dataType = dataType; - this.isWide = isWide; this.qsDataType = dataType; // TODO: remove this field } } diff --git a/packages/SettingsLib/src/com/android/settingslib/mobile/TelephonyIcons.java b/packages/SettingsLib/src/com/android/settingslib/mobile/TelephonyIcons.java index f8565bc2279f7..d4e58f7a2fc43 100644 --- a/packages/SettingsLib/src/com/android/settingslib/mobile/TelephonyIcons.java +++ b/packages/SettingsLib/src/com/android/settingslib/mobile/TelephonyIcons.java @@ -50,178 +50,194 @@ public class TelephonyIcons { null, null, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, - 0, 0, + 0, + 0, 0, 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.carrier_network_change_mode, - 0, - false); + 0 + ); public static final MobileIconGroup THREE_G = new MobileIconGroup( "3G", null, null, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, - 0, 0, + 0, + 0, 0, 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.data_connection_3g, - TelephonyIcons.ICON_3G, - true); + TelephonyIcons.ICON_3G + ); public static final MobileIconGroup WFC = new MobileIconGroup( "WFC", null, null, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, - 0, 0, + 0, + 0, 0, 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], - 0, 0, false); + 0, + 0); public static final MobileIconGroup UNKNOWN = new MobileIconGroup( "Unknown", null, null, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, - 0, 0, + 0, + 0, 0, 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], - 0, 0, false); + 0, + 0); public static final MobileIconGroup E = new MobileIconGroup( "E", null, null, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, - 0, 0, + 0, + 0, 0, 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.data_connection_edge, - TelephonyIcons.ICON_E, - false); + TelephonyIcons.ICON_E + ); public static final MobileIconGroup ONE_X = new MobileIconGroup( "1X", null, null, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, - 0, 0, + 0, + 0, 0, 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.data_connection_cdma, - TelephonyIcons.ICON_1X, - true); + TelephonyIcons.ICON_1X + ); public static final MobileIconGroup G = new MobileIconGroup( "G", null, null, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, - 0, 0, + 0, + 0, 0, 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.data_connection_gprs, - TelephonyIcons.ICON_G, - false); + TelephonyIcons.ICON_G + ); public static final MobileIconGroup H = new MobileIconGroup( "H", null, null, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, - 0, 0, + 0, + 0, 0, 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.data_connection_3_5g, - TelephonyIcons.ICON_H, - false); + TelephonyIcons.ICON_H + ); public static final MobileIconGroup H_PLUS = new MobileIconGroup( "H+", null, null, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, - 0, 0, + 0, + 0, 0, 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.data_connection_3_5g_plus, - TelephonyIcons.ICON_H_PLUS, - false); + TelephonyIcons.ICON_H_PLUS + ); public static final MobileIconGroup FOUR_G = new MobileIconGroup( "4G", null, null, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, - 0, 0, + 0, + 0, 0, 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.data_connection_4g, - TelephonyIcons.ICON_4G, - true); + TelephonyIcons.ICON_4G + ); public static final MobileIconGroup FOUR_G_PLUS = new MobileIconGroup( "4G+", null, null, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, - 0, 0, + 0, + 0, 0, 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.data_connection_4g_plus, - TelephonyIcons.ICON_4G_PLUS, - true); + TelephonyIcons.ICON_4G_PLUS + ); public static final MobileIconGroup LTE = new MobileIconGroup( "LTE", null, null, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, - 0, 0, + 0, + 0, 0, 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.data_connection_lte, - TelephonyIcons.ICON_LTE, - true); + TelephonyIcons.ICON_LTE + ); public static final MobileIconGroup LTE_PLUS = new MobileIconGroup( "LTE+", null, null, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, - 0, 0, + 0, + 0, 0, 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.data_connection_lte_plus, - TelephonyIcons.ICON_LTE_PLUS, - true); + TelephonyIcons.ICON_LTE_PLUS + ); public static final MobileIconGroup LTE_CA_5G_E = new MobileIconGroup( "5Ge", null, null, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, - 0, 0, + 0, + 0, 0, 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.data_connection_5ge_html, - TelephonyIcons.ICON_5G_E, - true); + TelephonyIcons.ICON_5G_E + ); public static final MobileIconGroup NR_5G = new MobileIconGroup( "5G", @@ -234,8 +250,8 @@ public class TelephonyIcons { 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.data_connection_5g, - TelephonyIcons.ICON_5G, - true); + TelephonyIcons.ICON_5G + ); public static final MobileIconGroup NR_5G_PLUS = new MobileIconGroup( "5G_PLUS", @@ -248,34 +264,36 @@ public class TelephonyIcons { 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.data_connection_5g_plus, - TelephonyIcons.ICON_5G_PLUS, - true); + TelephonyIcons.ICON_5G_PLUS + ); public static final MobileIconGroup DATA_DISABLED = new MobileIconGroup( "DataDisabled", null, null, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, - 0, 0, + 0, + 0, 0, 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.cell_data_off_content_description, - 0, - false); + 0 + ); public static final MobileIconGroup NOT_DEFAULT_DATA = new MobileIconGroup( "NotDefaultData", null, null, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, - 0, 0, + 0, + 0, 0, 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.not_default_data_content_description, - 0, - false); + 0 + ); public static final MobileIconGroup CARRIER_MERGED_WIFI = new MobileIconGroup( "CWF", @@ -288,8 +306,8 @@ public class TelephonyIcons { /* qsDiscState= */ 0, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], R.string.data_connection_carrier_wifi, - TelephonyIcons.ICON_CWF, - /* isWide= */ true); + TelephonyIcons.ICON_CWF + ); // When adding a new MobileIconGround, check if the dataContentDescription has to be filtered // in QSCarrier#hasValidTypeContentDescription diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java index 0f67ee078c816..675bbc4d1acf0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -419,7 +419,7 @@ public class MobileSignalController extends SignalController, D public CharSequence typeContentDescription; public CharSequence typeContentDescriptionHtml; public CharSequence description; - public boolean isWide; public int subId; public boolean roaming; public boolean showTriangle; @@ -109,7 +108,7 @@ public interface NetworkController extends CallbackController, D public MobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType, int qsType, boolean activityIn, boolean activityOut, CharSequence typeContentDescription, CharSequence typeContentDescriptionHtml, - CharSequence description, boolean isWide, int subId, boolean roaming, + CharSequence description, int subId, boolean roaming, boolean showTriangle) { this.statusIcon = statusIcon; this.qsIcon = qsIcon; @@ -120,7 +119,6 @@ public interface NetworkController extends CallbackController, D this.typeContentDescription = typeContentDescription; this.typeContentDescriptionHtml = typeContentDescriptionHtml; this.description = description; - this.isWide = isWide; this.subId = subId; this.roaming = roaming; this.showTriangle = showTriangle; @@ -138,7 +136,6 @@ public interface NetworkController extends CallbackController, D .append(",typeContentDescription=").append(typeContentDescription) .append(",typeContentDescriptionHtml=").append(typeContentDescriptionHtml) .append(",description=").append(description) - .append(",isWide=").append(isWide) .append(",subId=").append(subId) .append(",roaming=").append(roaming) .append(",showTriangle=").append(showTriangle) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java index fc19564bf554f..22dff7a266dbc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java @@ -172,7 +172,7 @@ public class WifiSignalController extends MobileDataIndicators mobileDataIndicators = new MobileDataIndicators( statusIcon, qsIcon, typeIcon, qsTypeIcon, mCurrentState.activityIn, mCurrentState.activityOut, dataContentDescription, - dataContentDescriptionHtml, description, icons.isWide, + dataContentDescriptionHtml, description, mCurrentState.subId, /* roaming= */ false, /* showTriangle= */ true ); callback.setMobileDataIndicators(mobileDataIndicators); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierGroupControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierGroupControllerTest.java index 126b332af30db..a1b72104509bf 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierGroupControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/carrier/QSCarrierGroupControllerTest.java @@ -232,7 +232,7 @@ public class QSCarrierGroupControllerTest extends LeakCheckedTest { MobileDataIndicators indicators = new MobileDataIndicators( mock(NetworkController.IconState.class), mock(NetworkController.IconState.class), - 0, 0, true, true, "", "", "", true, 0, true, true); + 0, 0, true, true, "", "", "", 0, true, true); mSignalCallback.setMobileDataIndicators(indicators); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java index 24182434f1bae..73538fbc7bc54 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java @@ -124,7 +124,7 @@ public class CallbackHandlerTest extends SysuiTestCase { boolean roaming = true; MobileDataIndicators indicators = new MobileDataIndicators( status, qs, type, qsType, in, out, typeDescription, - typeDescriptionHtml, description, wide, subId, roaming, true); + typeDescriptionHtml, description, subId, roaming, true); mHandler.setMobileDataIndicators(indicators); waitForCallbacks(); @@ -142,7 +142,6 @@ public class CallbackHandlerTest extends SysuiTestCase { assertEquals(typeDescription, expected.typeContentDescription); assertEquals(typeDescriptionHtml, expected.typeContentDescriptionHtml); assertEquals(description, expected.description); - assertEquals(wide, expected.isWide); assertEquals(subId, expected.subId); assertTrue(expected.roaming); assertTrue(expected.showTriangle);