From f58390a3cdd54925c01b3faf1c3d1fcd9fc34426 Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Thu, 26 Aug 2021 11:17:09 -0400 Subject: [PATCH 1/5] Move callback anonymous classes out of constructor Cleans up the MobileSignalController constructor a bit. No behavior change Bug: 197851948 Test: atest SystemUITests Change-Id: I6fa7adaa6e2f82f4c4c0a1f01b2ca5339d86d1c6 Merged-In: I6fa7adaa6e2f82f4c4c0a1f01b2ca5339d86d1c6 --- .../policy/MobileSignalController.java | 158 +++++++++--------- 1 file changed, 79 insertions(+), 79 deletions(-) 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 3490e1567ea81..0f67ee078c816 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -108,8 +108,6 @@ 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); From 0b90863da9fa03fb3dc6c6e03190f0fc14587f2f Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Fri, 27 Aug 2021 16:00:58 -0400 Subject: [PATCH 3/5] Remove qsDataType since it was the same as dataType This resolves a TODO and removes unused fields Test: atest SystemUITests Bug: 197851948 Change-Id: I5e2eb4896966516f34980863e18b99368f395b20 Merged-In: I5e2eb4896966516f34980863e18b99368f395b20 --- .../SettingsLib/src/com/android/settingslib/SignalIcon.java | 2 -- .../systemui/statusbar/policy/MobileSignalController.java | 6 +++--- .../systemui/statusbar/policy/WifiSignalController.java | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java b/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java index aba06056dd34d..85130031e07b6 100644 --- a/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java +++ b/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java @@ -139,7 +139,6 @@ public class SignalIcon { public static class MobileIconGroup extends IconGroup { public final int dataContentDescription; // mContentDescriptionDataType public final int dataType; - public final int qsDataType; public MobileIconGroup(String name, int[][] sbIcons, int[][] qsIcons, int[] contentDesc, int sbNullState, int qsNullState, int sbDiscState, int qsDiscState, @@ -148,7 +147,6 @@ public class SignalIcon { qsDiscState, discContentDesc); this.dataContentDescription = dataContentDesc; this.dataType = dataType; - this.qsDataType = dataType; // TODO: remove this field } } 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 675bbc4d1acf0..5008962ec77d7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -399,7 +399,7 @@ public class MobileSignalController extends SignalController Date: Wed, 1 Sep 2021 17:53:56 -0400 Subject: [PATCH 4/5] Move some logic to MobileState Some variables were being created in MobileSignalController#notifyListeners() that were just an aggregation of a few fields on MobileState. This CL replaces those with method calls on MobileState to clean things up and make them loggable from the state. Test: atest SystemUITests Test: m -j RunSettingsLibRoboTests ROBOTEST_FILTER="com.android.settingslib.MobileStateTest" Bug: 197851948 Change-Id: I06d5e56923897cddb53189359dc9444cdfee6e78 Merged-In: I06d5e56923897cddb53189359dc9444cdfee6e78 --- .../com/android/settingslib/SignalIcon.java | 110 ++++++++++++--- .../android/settingslib/MobileStateTest.java | 133 ++++++++++++++++++ .../policy/MobileSignalController.java | 53 +++---- 3 files changed, 252 insertions(+), 44 deletions(-) create mode 100644 packages/SettingsLib/tests/robotests/src/com/android/settingslib/MobileStateTest.java diff --git a/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java b/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java index 85130031e07b6..383e726c69c7c 100644 --- a/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java +++ b/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java @@ -15,6 +15,8 @@ */ package com.android.settingslib; +import com.android.settingslib.mobile.TelephonyIcons; + import java.text.SimpleDateFormat; import java.util.Objects; @@ -40,9 +42,17 @@ public class SignalIcon { // For logging. public final String name; - public IconGroup(String name, int[][] sbIcons, int[][] qsIcons, int[] contentDesc, - int sbNullState, int qsNullState, int sbDiscState, int qsDiscState, - int discContentDesc) { + public IconGroup( + String name, + int[][] sbIcons, + int[][] qsIcons, + int[] contentDesc, + int sbNullState, + int qsNullState, + int sbDiscState, + int qsDiscState, + int discContentDesc + ) { this.name = name; this.sbIcons = sbIcons; this.qsIcons = qsIcons; @@ -131,6 +141,19 @@ public class SignalIcon { && other.activityOut == activityOut && other.rssi == rssi; } + + @Override + public int hashCode() { + return Objects.hash( + connected, + enabled, + level, + inetCondition, + iconGroup, + activityIn, + activityOut, + rssi); + } } /** @@ -140,11 +163,28 @@ public class SignalIcon { public final int dataContentDescription; // mContentDescriptionDataType public final int dataType; - public MobileIconGroup(String name, int[][] sbIcons, int[][] qsIcons, int[] contentDesc, - int sbNullState, int qsNullState, int sbDiscState, int qsDiscState, - int discContentDesc, int dataContentDesc, int dataType) { - super(name, sbIcons, qsIcons, contentDesc, sbNullState, qsNullState, sbDiscState, - qsDiscState, discContentDesc); + public MobileIconGroup( + String name, + int[][] sbIcons, + int[][] qsIcons, + int[] contentDesc, + int sbNullState, + int qsNullState, + int sbDiscState, + int qsDiscState, + int discContentDesc, + int dataContentDesc, + int dataType + ) { + super(name, + sbIcons, + qsIcons, + contentDesc, + sbNullState, + qsNullState, + sbDiscState, + qsDiscState, + discContentDesc); this.dataContentDescription = dataContentDesc; this.dataType = dataType; } @@ -183,6 +223,22 @@ public class SignalIcon { defaultDataOff = state.defaultDataOff; } + /** @return true if this state is disabled or not default data */ + public boolean isDataDisabledOrNotDefault() { + return (iconGroup == TelephonyIcons.DATA_DISABLED + || (iconGroup == TelephonyIcons.NOT_DEFAULT_DATA)) && userSetup; + } + + /** @return if this state is considered to have inbound activity */ + public boolean hasActivityIn() { + return dataConnected && !carrierNetworkChangeMode && activityIn; + } + + /** @return if this state is considered to have outbound activity */ + public boolean hasActivityOut() { + return dataConnected && !carrierNetworkChangeMode && activityOut; + } + @Override protected void toString(StringBuilder builder) { super.toString(builder); @@ -204,17 +260,33 @@ public class SignalIcon { @Override public boolean equals(Object o) { return super.equals(o) - && Objects.equals(((MobileState) o).networkName, networkName) - && Objects.equals(((MobileState) o).networkNameData, networkNameData) - && ((MobileState) o).dataSim == dataSim - && ((MobileState) o).dataConnected == dataConnected - && ((MobileState) o).isEmergency == isEmergency - && ((MobileState) o).airplaneMode == airplaneMode - && ((MobileState) o).carrierNetworkChangeMode == carrierNetworkChangeMode - && ((MobileState) o).userSetup == userSetup - && ((MobileState) o).isDefault == isDefault - && ((MobileState) o).roaming == roaming - && ((MobileState) o).defaultDataOff == defaultDataOff; + && Objects.equals(((MobileState) o).networkName, networkName) + && Objects.equals(((MobileState) o).networkNameData, networkNameData) + && ((MobileState) o).dataSim == dataSim + && ((MobileState) o).dataConnected == dataConnected + && ((MobileState) o).isEmergency == isEmergency + && ((MobileState) o).airplaneMode == airplaneMode + && ((MobileState) o).carrierNetworkChangeMode == carrierNetworkChangeMode + && ((MobileState) o).userSetup == userSetup + && ((MobileState) o).isDefault == isDefault + && ((MobileState) o).roaming == roaming + && ((MobileState) o).defaultDataOff == defaultDataOff; + } + + @Override + public int hashCode() { + return Objects.hash(super.hashCode(), + networkName, + networkNameData, + dataSim, + dataConnected, + isEmergency, + airplaneMode, + carrierNetworkChangeMode, + userSetup, + isDefault, + roaming, + defaultDataOff); } } } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/MobileStateTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/MobileStateTest.java new file mode 100644 index 0000000000000..92a32bce17992 --- /dev/null +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/MobileStateTest.java @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settingslib; + +import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertTrue; + +import com.android.settingslib.mobile.TelephonyIcons; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; + +@RunWith(RobolectricTestRunner.class) +public class MobileStateTest { + + private SignalIcon.MobileState mState = new SignalIcon.MobileState(); + + @Before + public void setUp() { + } + + @Test + public void testIsDataDisabledOrNotDefault_dataDisabled() { + mState.iconGroup = TelephonyIcons.DATA_DISABLED; + mState.userSetup = true; + + assertTrue(mState.isDataDisabledOrNotDefault()); + } + + @Test + public void testIsDataDisabledOrNotDefault_notDefaultData() { + mState.iconGroup = TelephonyIcons.NOT_DEFAULT_DATA; + mState.userSetup = true; + + assertTrue(mState.isDataDisabledOrNotDefault()); + } + + @Test + public void testIsDataDisabledOrNotDefault_notDisabled() { + mState.iconGroup = TelephonyIcons.G; + mState.userSetup = true; + + assertFalse(mState.isDataDisabledOrNotDefault()); + } + + @Test + public void testHasActivityIn_noData_noActivity() { + mState.dataConnected = false; + mState.carrierNetworkChangeMode = false; + mState.activityIn = false; + + assertFalse(mState.hasActivityIn()); + } + + @Test + public void testHasActivityIn_noData_activityIn() { + mState.dataConnected = false; + mState.carrierNetworkChangeMode = false; + mState.activityIn = true; + + assertFalse(mState.hasActivityIn()); + } + + @Test + public void testHasActivityIn_dataConnected_activityIn() { + mState.dataConnected = true; + mState.carrierNetworkChangeMode = false; + mState.activityIn = true; + + assertTrue(mState.hasActivityIn()); + } + + @Test + public void testHasActivityIn_carrierNetworkChange() { + mState.dataConnected = true; + mState.carrierNetworkChangeMode = true; + mState.activityIn = true; + + assertFalse(mState.hasActivityIn()); + } + + @Test + public void testHasActivityOut_noData_noActivity() { + mState.dataConnected = false; + mState.carrierNetworkChangeMode = false; + mState.activityOut = false; + + assertFalse(mState.hasActivityOut()); + } + + @Test + public void testHasActivityOut_noData_activityOut() { + mState.dataConnected = false; + mState.carrierNetworkChangeMode = false; + mState.activityOut = true; + + assertFalse(mState.hasActivityOut()); + } + + @Test + public void testHasActivityOut_dataConnected_activityOut() { + mState.dataConnected = true; + mState.carrierNetworkChangeMode = false; + mState.activityOut = true; + + assertTrue(mState.hasActivityOut()); + } + + @Test + public void testHasActivityOut_carrierNetworkChange() { + mState.dataConnected = true; + mState.carrierNetworkChangeMode = true; + mState.activityOut = true; + + assertFalse(mState.hasActivityOut()); + } +} 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 5008962ec77d7..9f59b094ef138 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -91,8 +91,7 @@ public class MobileSignalController extends SignalController mNetworkToIconLookup; + private Map mNetworkToIconLookup; // Since some pieces of the phone state are interdependent we store it locally, // this could potentially become part of MobileState for simplification/complication @@ -385,9 +384,8 @@ public class MobileSignalController extends SignalController Date: Thu, 2 Sep 2021 17:24:07 -0400 Subject: [PATCH 5/5] Create QsInfo and SbInfo boxes for MobileSignalController Simplify MobileSignalController#notifyListeners() by splitting the QS and SB portions of the method into their own *Info objects and moving those calls out to their own methods. Also adds mNetworkToIconLookup, mProviderModelBehavior, and mProviderModelSetting to the MobileSignalController logs. Test: dumpsys Bug 197851948 Change-Id: Ibdaec230c4a407d23804fb8250809cc877a7f183 Merged-In: Ibdaec230c4a407d23804fb8250809cc877a7f183 --- .../com/android/settingslib/SignalIcon.java | 8 +- .../systemui/qs/tiles/CellularTile.java | 2 +- .../systemui/qs/tiles/InternetTile.java | 6 +- .../policy/MobileSignalController.java | 172 ++++++++++-------- .../statusbar/policy/NetworkController.java | 20 +- .../statusbar/policy/CallbackHandlerTest.java | 2 +- 6 files changed, 119 insertions(+), 91 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java b/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java index 383e726c69c7c..794b0eb665199 100644 --- a/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java +++ b/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java @@ -239,6 +239,11 @@ public class SignalIcon { return dataConnected && !carrierNetworkChangeMode && activityOut; } + /** @return true if this state should show a RAT icon in quick settings */ + public boolean showQuickSettingsRatIcon() { + return dataConnected || isDataDisabledOrNotDefault(); + } + @Override protected void toString(StringBuilder builder) { super.toString(builder); @@ -254,7 +259,8 @@ public class SignalIcon { builder.append("carrierNetworkChangeMode=").append(carrierNetworkChangeMode) .append(','); builder.append("userSetup=").append(userSetup).append(','); - builder.append("defaultDataOff=").append(defaultDataOff); + builder.append("defaultDataOff=").append(defaultDataOff).append(','); + builder.append("showQuickSettingsRatIcon=").append(showQuickSettingsRatIcon()); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java index 8e886e82d352c..b1af8416e06d6 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -275,7 +275,7 @@ public class CellularTile extends QSTileImpl { return; } mInfo.dataSubscriptionName = mController.getMobileDataNetworkName(); - mInfo.dataContentDescription = indicators.description != null + mInfo.dataContentDescription = indicators.qsDescription != null ? indicators.typeContentDescriptionHtml : null; mInfo.activityIn = indicators.activityIn; mInfo.activityOut = indicators.activityOut; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java index cc9e7485dcffa..530804ed09e7e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java @@ -279,9 +279,9 @@ public class InternetTile extends QSTileImpl { // Not data sim, don't display. return; } - mCellularInfo.mDataSubscriptionName = indicators.description == null - ? mController.getMobileDataNetworkName() : indicators.description; - mCellularInfo.mDataContentDescription = indicators.description != null + mCellularInfo.mDataSubscriptionName = indicators.qsDescription == null + ? mController.getMobileDataNetworkName() : indicators.qsDescription; + mCellularInfo.mDataContentDescription = indicators.qsDescription != null ? indicators.typeContentDescriptionHtml : null; mCellularInfo.mMobileSignalIconId = indicators.qsIcon.icon; mCellularInfo.mQsTypeIcon = indicators.qsType; 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 9f59b094ef138..a543c7c95d16f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -385,92 +385,82 @@ public class MobileSignalController extends SignalController, D .append(",qsIcon=").append(qsIcon == null ? "" : qsIcon.toString()) .append(",activityIn=").append(activityIn) .append(",activityOut=").append(activityOut) - .append(",description=").append(description) + .append(",qsDescription=").append(description) .append(",isTransient=").append(isTransient) .append(",statusLabel=").append(statusLabel) .append(']').toString(); @@ -100,7 +100,7 @@ public interface NetworkController extends CallbackController, D public boolean activityOut; public CharSequence typeContentDescription; public CharSequence typeContentDescriptionHtml; - public CharSequence description; + public CharSequence qsDescription; public int subId; public boolean roaming; public boolean showTriangle; @@ -108,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, int subId, boolean roaming, + CharSequence qsDescription, int subId, boolean roaming, boolean showTriangle) { this.statusIcon = statusIcon; this.qsIcon = qsIcon; @@ -118,7 +118,7 @@ public interface NetworkController extends CallbackController, D this.activityOut = activityOut; this.typeContentDescription = typeContentDescription; this.typeContentDescriptionHtml = typeContentDescriptionHtml; - this.description = description; + this.qsDescription = qsDescription; this.subId = subId; this.roaming = roaming; this.showTriangle = showTriangle; @@ -135,7 +135,7 @@ public interface NetworkController extends CallbackController, D .append(",activityOut=").append(activityOut) .append(",typeContentDescription=").append(typeContentDescription) .append(",typeContentDescriptionHtml=").append(typeContentDescriptionHtml) - .append(",description=").append(description) + .append(",description=").append(qsDescription) .append(",subId=").append(subId) .append(",roaming=").append(roaming) .append(",showTriangle=").append(showTriangle) @@ -183,11 +183,13 @@ public interface NetworkController extends CallbackController, D default void setCallIndicator(IconState statusIcon, int subId) {} } - public interface EmergencyListener { + /** */ + interface EmergencyListener { void setEmergencyCallsOnly(boolean emergencyOnly); } - public static class IconState { + /** */ + class IconState { public final boolean visible; public final int icon; public final String contentDescription; @@ -217,7 +219,7 @@ public interface NetworkController extends CallbackController, D * Tracks changes in access points. Allows listening for changes, scanning for new APs, * and connecting to new ones. */ - public interface AccessPointController { + interface AccessPointController { void addAccessPointCallback(AccessPointCallback callback); void removeAccessPointCallback(AccessPointCallback callback); void scanForAccessPoints(); @@ -227,7 +229,7 @@ public interface NetworkController extends CallbackController, D boolean canConfigWifi(); boolean canConfigMobileData(); - public interface AccessPointCallback { + interface AccessPointCallback { void onAccessPointsChanged(List accessPoints); void onSettingsActivityTriggered(Intent settingsIntent); } 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 73538fbc7bc54..3c55df934f76a 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 @@ -141,7 +141,7 @@ public class CallbackHandlerTest extends SysuiTestCase { assertEquals(out, expected.activityOut); assertEquals(typeDescription, expected.typeContentDescription); assertEquals(typeDescriptionHtml, expected.typeContentDescriptionHtml); - assertEquals(description, expected.description); + assertEquals(description, expected.qsDescription); assertEquals(subId, expected.subId); assertTrue(expected.roaming); assertTrue(expected.showTriangle);