SystemUI: Display combined carrier names in InternetTile

Display combined carrier names in InternetTile when China
carriers are in domestic roaming.

Change-Id: Ife3332056463c819562c30a265d37ec88a243afe
CRs-Fixed: 3422400

2 files changed, 30 insertions, 4 deletions

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 d30402466d8d..bcb5a184a8b7 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java
@@ -14,6 +14,12 @@
  * limitations under the License.
  */
 
+/**
+ * Changes from Qualcomm Innovation Center are provided under the following license:
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause-Clear
+ */
+
 package com.android.systemui.qs.tiles;
 
 import android.annotation.NonNull;
@@ -60,6 +66,7 @@ import com.android.systemui.statusbar.connectivity.NetworkController;
 import com.android.systemui.statusbar.connectivity.SignalCallback;
 import com.android.systemui.statusbar.connectivity.WifiIcons;
 import com.android.systemui.statusbar.connectivity.WifiIndicators;
+import com.android.systemui.util.CarrierNameCustomization;
 
 import java.io.PrintWriter;
 
@@ -78,6 +85,7 @@ public class InternetTile extends QSTileImpl<SignalState> {
     protected final InternetSignalCallback mSignalCallback = new InternetSignalCallback();
     private final InternetDialogFactory mInternetDialogFactory;
     final Handler mHandler;
+    private CarrierNameCustomization mCarrierNameCustomization;
 
     @Inject
     public InternetTile(
@@ -91,7 +99,8 @@ public class InternetTile extends QSTileImpl<SignalState> {
             QSLogger qsLogger,
             NetworkController networkController,
             AccessPointController accessPointController,
-            InternetDialogFactory internetDialogFactory
+            InternetDialogFactory internetDialogFactory,
+            CarrierNameCustomization carrierNameCustomization
     ) {
         super(host, backgroundLooper, mainHandler, falsingManager, metricsLogger,
                 statusBarStateController, activityStarter, qsLogger);
@@ -101,6 +110,7 @@ public class InternetTile extends QSTileImpl<SignalState> {
         mAccessPointController = accessPointController;
         mDataController = mController.getMobileDataController();
         mController.observe(getLifecycle(), mSignalCallback);
+        mCarrierNameCustomization = carrierNameCustomization;
     }
 
     @Override
@@ -287,8 +297,14 @@ public class InternetTile extends QSTileImpl<SignalState> {
                 // Not data sim, don't display.
                 return;
             }
-            mCellularInfo.mDataSubscriptionName = indicators.qsDescription == null
-                    ? mController.getMobileDataNetworkName() : indicators.qsDescription;
+            if (mCarrierNameCustomization.isRoamingCustomizationEnabled()
+                    && mCarrierNameCustomization.isRoaming(indicators.subId)) {
+                mCellularInfo.mDataSubscriptionName =
+                        mCarrierNameCustomization.getRoamingCarrierName(indicators.subId);
+            } else {
+                mCellularInfo.mDataSubscriptionName = indicators.qsDescription == null
+                        ? mController.getMobileDataNetworkName() : indicators.qsDescription;
+            }
             mCellularInfo.mDataContentDescription = indicators.qsDescription != null
                     ? indicators.typeContentDescriptionHtml : null;
             mCellularInfo.mMobileSignalIconId = indicators.qsIcon.icon;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/InternetTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/InternetTileTest.java
index d91baa5e7fcb..1e55ef48fbd9 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/InternetTileTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/InternetTileTest.java
@@ -14,6 +14,12 @@
  * limitations under the License.
  */
 
+/**
+ * Changes from Qualcomm Innovation Center are provided under the following license:
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause-Clear
+ */
+
 package com.android.systemui.qs.tiles;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -39,6 +45,7 @@ import com.android.systemui.qs.logging.QSLogger;
 import com.android.systemui.qs.tiles.dialog.InternetDialogFactory;
 import com.android.systemui.statusbar.connectivity.AccessPointController;
 import com.android.systemui.statusbar.connectivity.NetworkController;
+import com.android.systemui.util.CarrierNameCustomization;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -59,6 +66,8 @@ public class InternetTileTest extends SysuiTestCase {
     private AccessPointController mAccessPointController;
     @Mock
     private InternetDialogFactory mInternetDialogFactory;
+    @Mock
+    private CarrierNameCustomization mCarrierNameCustomization;
 
     private TestableLooper mTestableLooper;
     private InternetTile mTile;
@@ -81,7 +90,8 @@ public class InternetTileTest extends SysuiTestCase {
             mock(QSLogger.class),
             mNetworkController,
             mAccessPointController,
-            mInternetDialogFactory
+            mInternetDialogFactory,
+            mCarrierNameCustomization
         );
 
         mTile.initialize();