summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jiaming Cheng <jiamingc@google.com> 2024-12-27 09:59:37 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2024-12-27 09:59:37 -0800
commit4d6a407ffe6f374ea02bbb547c34f15f95eab3bd (patch)
tree8427f3747b6fc1fb2373f8c8053c262cec75b9a6
parent1ab7f9ebdc5831d04bda59f467ff554912d90ff0 (diff)
parent2a803b207b7ee7188035251872612570d3beef91 (diff)
Merge "[QSDetailedView] Rename InternetDialogController to InternetDetailsContentController" into main
Diffstat
-rw-r--r--packages/SystemUI/Android.bp2
-rw-r--r--packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/dialog/InternetAdapterTest.java16
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetAdapter.java32
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentController.java (renamed from packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java)18
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegate.java98
-rw-r--r--packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentControllerTest.java (renamed from packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateControllerTest.java)266
-rw-r--r--packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateTest.java138
7 files changed, 297 insertions, 273 deletions
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 3ee2db10d7e5..7de258b9a1db 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -284,7 +284,7 @@ filegroup {
"tests/src/**/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java",
"tests/src/**/systemui/statusbar/phone/KeyguardClockPositionAlgorithmTest.java",
"tests/src/**/systemui/shared/system/RemoteTransitionTest.java",
- "tests/src/**/systemui/qs/tiles/dialog/InternetDialogDelegateControllerTest.java",
+ "tests/src/**/systemui/qs/tiles/dialog/InternetDetailsContentControllerTest.java",
"tests/src/**/systemui/qs/external/TileLifecycleManagerTest.java",
"tests/src/**/systemui/ScreenDecorationsTest.java",
"tests/src/**/systemui/statusbar/policy/BatteryControllerStartableTest.java",
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/dialog/InternetAdapterTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/dialog/InternetAdapterTest.java
index 5c6657b98801..cfbc8128282c 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/dialog/InternetAdapterTest.java
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/dialog/InternetAdapterTest.java
@@ -1,6 +1,6 @@
package com.android.systemui.qs.tiles.dialog;
-import static com.android.systemui.qs.tiles.dialog.InternetDialogController.MAX_WIFI_ENTRY_COUNT;
+import static com.android.systemui.qs.tiles.dialog.InternetDetailsContentController.MAX_WIFI_ENTRY_COUNT;
import static com.google.common.truth.Truth.assertThat;
@@ -63,7 +63,7 @@ public class InternetAdapterTest extends SysuiTestCase {
@Mock
private WifiEntry mWifiEntry;
@Mock
- private InternetDialogController mInternetDialogController;
+ private InternetDetailsContentController mInternetDetailsContentController;
@Mock
private Drawable mWifiDrawable;
@Mock
@@ -86,7 +86,7 @@ public class InternetAdapterTest extends SysuiTestCase {
when(mWifiEntry.getTitle()).thenReturn(WIFI_TITLE);
when(mWifiEntry.getSummary(false)).thenReturn(WIFI_SUMMARY);
- mInternetAdapter = new InternetAdapter(mInternetDialogController, mScope);
+ mInternetAdapter = new InternetAdapter(mInternetDetailsContentController, mScope);
mViewHolder = mInternetAdapter.onCreateViewHolder(new LinearLayout(mContext), 0);
mInternetAdapter.setWifiEntries(Arrays.asList(mWifiEntry), 1 /* wifiEntriesCount */);
}
@@ -124,7 +124,7 @@ public class InternetAdapterTest extends SysuiTestCase {
@Test
public void onBindViewHolder_getWifiDrawableNull_noCrash() {
- when(mInternetDialogController.getWifiDrawable(any())).thenReturn(null);
+ when(mInternetDetailsContentController.getWifiDrawable(any())).thenReturn(null);
mInternetAdapter.onBindViewHolder(mViewHolder, 0);
@@ -133,7 +133,7 @@ public class InternetAdapterTest extends SysuiTestCase {
@Test
public void onBindViewHolder_getWifiDrawableNotNull_setWifiIconDrawable() {
- when(mInternetDialogController.getWifiDrawable(any())).thenReturn(mWifiDrawable);
+ when(mInternetDetailsContentController.getWifiDrawable(any())).thenReturn(mWifiDrawable);
mInternetAdapter.onBindViewHolder(mViewHolder, 0);
@@ -232,7 +232,7 @@ public class InternetAdapterTest extends SysuiTestCase {
mViewHolder.onWifiClick(mWifiEntry, mock(View.class));
- verify(mInternetDialogController).startActivityForDialog(any());
+ verify(mInternetDetailsContentController).startActivityForDialog(any());
verify(mSpyContext, never()).startActivity(any());
}
@@ -242,7 +242,7 @@ public class InternetAdapterTest extends SysuiTestCase {
mViewHolder.onWifiClick(mWifiEntry, mock(View.class));
- verify(mInternetDialogController).connect(mWifiEntry);
+ verify(mInternetDetailsContentController).connect(mWifiEntry);
}
@Test
@@ -252,7 +252,7 @@ public class InternetAdapterTest extends SysuiTestCase {
mViewHolder.onWifiClick(mWifiEntry, mock(View.class));
- verify(mInternetDialogController).launchWifiDetailsSetting(anyString(), any());
+ verify(mInternetDetailsContentController).launchWifiDetailsSetting(anyString(), any());
}
@Test
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetAdapter.java
index 7516ca030d4b..b21c3e4e44e1 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetAdapter.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetAdapter.java
@@ -54,20 +54,21 @@ public class InternetAdapter extends RecyclerView.Adapter<InternetAdapter.Intern
private static final String TAG = "InternetAdapter";
- private final InternetDialogController mInternetDialogController;
+ private final InternetDetailsContentController mInternetDetailsContentController;
private final CoroutineScope mCoroutineScope;
@Nullable
private List<WifiEntry> mWifiEntries;
@VisibleForTesting
protected int mWifiEntriesCount;
@VisibleForTesting
- protected int mMaxEntriesCount = InternetDialogController.MAX_WIFI_ENTRY_COUNT;
+ protected int mMaxEntriesCount = InternetDetailsContentController.MAX_WIFI_ENTRY_COUNT;
protected View mHolderView;
protected Context mContext;
- public InternetAdapter(InternetDialogController controller, CoroutineScope coroutineScope) {
- mInternetDialogController = controller;
+ public InternetAdapter(InternetDetailsContentController controller,
+ CoroutineScope coroutineScope) {
+ mInternetDetailsContentController = controller;
mCoroutineScope = coroutineScope;
}
@@ -77,7 +78,8 @@ public class InternetAdapter extends RecyclerView.Adapter<InternetAdapter.Intern
mContext = viewGroup.getContext();
mHolderView = LayoutInflater.from(mContext).inflate(R.layout.internet_list_item,
viewGroup, false);
- return new InternetViewHolder(mHolderView, mInternetDialogController, mCoroutineScope);
+ return new InternetViewHolder(mHolderView, mInternetDetailsContentController,
+ mCoroutineScope);
}
@Override
@@ -137,16 +139,17 @@ public class InternetAdapter extends RecyclerView.Adapter<InternetAdapter.Intern
final TextView mWifiSummaryText;
final ImageView mWifiEndIcon;
final Context mContext;
- final InternetDialogController mInternetDialogController;
+ final InternetDetailsContentController mInternetDetailsContentController;
final CoroutineScope mCoroutineScope;
@Nullable
private Job mJob;
- InternetViewHolder(View view, InternetDialogController internetDialogController,
+ InternetViewHolder(View view,
+ InternetDetailsContentController internetDetailsContentController,
CoroutineScope coroutineScope) {
super(view);
mContext = view.getContext();
- mInternetDialogController = internetDialogController;
+ mInternetDetailsContentController = internetDetailsContentController;
mCoroutineScope = coroutineScope;
mContainerLayout = view.requireViewById(R.id.internet_container);
mWifiListLayout = view.requireViewById(R.id.wifi_list);
@@ -169,7 +172,7 @@ public class InternetAdapter extends RecyclerView.Adapter<InternetAdapter.Intern
mWifiListLayout.setEnabled(shouldEnabled(wifiEntry));
if (connectedState != WifiEntry.CONNECTED_STATE_DISCONNECTED) {
mWifiListLayout.setOnClickListener(
- v -> mInternetDialogController.launchWifiDetailsSetting(
+ v -> mInternetDetailsContentController.launchWifiDetailsSetting(
wifiEntry.getKey(), v));
return;
}
@@ -193,7 +196,7 @@ public class InternetAdapter extends RecyclerView.Adapter<InternetAdapter.Intern
if (mJob == null) {
mJob = WifiUtils.checkWepAllowed(mContext, mCoroutineScope, wifiEntry.getSsid(),
WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG, intent -> {
- mInternetDialogController.startActivityForDialog(intent);
+ mInternetDetailsContentController.startActivityForDialog(intent);
return null;
}, () -> {
wifiConnect(wifiEntry, view);
@@ -211,19 +214,20 @@ public class InternetAdapter extends RecyclerView.Adapter<InternetAdapter.Intern
true /* connectForCaller */);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
- mInternetDialogController.startActivityForDialog(intent);
+ mInternetDetailsContentController.startActivityForDialog(intent);
return;
}
if (wifiEntry.canConnect()) {
- mInternetDialogController.connect(wifiEntry);
+ mInternetDetailsContentController.connect(wifiEntry);
return;
}
if (wifiEntry.isSaved()) {
Log.w(TAG, "The saved Wi-Fi network does not allow to connect. SSID:"
+ wifiEntry.getSsid());
- mInternetDialogController.launchWifiDetailsSetting(wifiEntry.getKey(), view);
+ mInternetDetailsContentController.launchWifiDetailsSetting(wifiEntry.getKey(),
+ view);
}
}
@@ -239,7 +243,7 @@ public class InternetAdapter extends RecyclerView.Adapter<InternetAdapter.Intern
@Nullable
Drawable getWifiDrawable(@NonNull WifiEntry wifiEntry) {
- Drawable drawable = mInternetDialogController.getWifiDrawable(wifiEntry);
+ Drawable drawable = mInternetDetailsContentController.getWifiDrawable(wifiEntry);
if (drawable == null) {
return null;
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentController.java
index 7036ef914a1c..23210ef0e688 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentController.java
@@ -117,9 +117,9 @@ import javax.inject.Inject;
/**
* Controller for Internet Dialog.
*/
-public class InternetDialogController implements AccessPointController.AccessPointCallback {
+public class InternetDetailsContentController implements AccessPointController.AccessPointCallback {
- private static final String TAG = "InternetDialogController";
+ private static final String TAG = "InternetDetailsContentController";
private static final String ACTION_WIFI_SCANNING_SETTINGS =
"android.settings.WIFI_SCANNING_SETTINGS";
/**
@@ -244,7 +244,8 @@ public class InternetDialogController implements AccessPointController.AccessPoi
}
@Inject
- public InternetDialogController(@ShadeDisplayAware Context context, UiEventLogger uiEventLogger,
+ public InternetDetailsContentController(@ShadeDisplayAware Context context,
+ UiEventLogger uiEventLogger,
ActivityStarter starter, AccessPointController accessPointController,
SubscriptionManager subscriptionManager, TelephonyManager telephonyManager,
@Nullable WifiManager wifiManager, ConnectivityManager connectivityManager,
@@ -260,7 +261,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi
FeatureFlags featureFlags
) {
if (DEBUG) {
- Log.d(TAG, "Init InternetDialogController");
+ Log.d(TAG, "Init InternetDetailsContentController");
}
mHandler = handler;
mWorkerHandler = workerHandler;
@@ -1108,13 +1109,13 @@ public class InternetDialogController implements AccessPointController.AccessPoi
static class WifiEntryConnectCallback implements WifiEntry.ConnectCallback {
final ActivityStarter mActivityStarter;
final WifiEntry mWifiEntry;
- final InternetDialogController mInternetDialogController;
+ final InternetDetailsContentController mInternetDetailsContentController;
WifiEntryConnectCallback(ActivityStarter activityStarter, WifiEntry connectWifiEntry,
- InternetDialogController internetDialogController) {
+ InternetDetailsContentController internetDetailsContentController) {
mActivityStarter = activityStarter;
mWifiEntry = connectWifiEntry;
- mInternetDialogController = internetDialogController;
+ mInternetDetailsContentController = internetDetailsContentController;
}
@Override
@@ -1129,7 +1130,8 @@ public class InternetDialogController implements AccessPointController.AccessPoi
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mActivityStarter.startActivity(intent, false /* dismissShade */);
} else if (status == CONNECT_STATUS_FAILURE_UNKNOWN) {
- mInternetDialogController.makeOverlayToast(R.string.wifi_failed_connect_message);
+ mInternetDetailsContentController.makeOverlayToast(
+ R.string.wifi_failed_connect_message);
} else {
if (DEBUG) {
Log.d(TAG, "connect failure reason=" + status);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegate.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegate.java
index 5e9deec58c58..c2bc2a7c5f2f 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegate.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegate.java
@@ -17,7 +17,7 @@ package com.android.systemui.qs.tiles.dialog;
import static com.android.settingslib.satellite.SatelliteDialogUtils.TYPE_IS_WIFI;
import static com.android.systemui.Prefs.Key.QS_HAS_TURNED_OFF_MOBILE_DATA;
-import static com.android.systemui.qs.tiles.dialog.InternetDialogController.MAX_WIFI_ENTRY_COUNT;
+import static com.android.systemui.qs.tiles.dialog.InternetDetailsContentController.MAX_WIFI_ENTRY_COUNT;
import android.app.AlertDialog;
import android.content.Context;
@@ -92,7 +92,7 @@ import java.util.concurrent.Executor;
*/
public class InternetDialogDelegate implements
SystemUIDialog.Delegate,
- InternetDialogController.InternetDialogCallback {
+ InternetDetailsContentController.InternetDialogCallback {
private static final String TAG = "InternetDialog";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
@@ -120,7 +120,7 @@ public class InternetDialogDelegate implements
@Nullable
private AlertDialog mAlertDialog;
private final UiEventLogger mUiEventLogger;
- private final InternetDialogController mInternetDialogController;
+ private final InternetDetailsContentController mInternetDetailsContentController;
private TextView mInternetDialogTitle;
private TextView mInternetDialogSubTitle;
private View mDivider;
@@ -195,7 +195,7 @@ public class InternetDialogDelegate implements
public InternetDialogDelegate(
@ShadeDisplayAware Context context,
InternetDialogManager internetDialogManager,
- InternetDialogController internetDialogController,
+ InternetDetailsContentController internetDetailsContentController,
@Assisted(CAN_CONFIG_MOBILE_DATA) boolean canConfigMobileData,
@Assisted(CAN_CONFIG_WIFI) boolean canConfigWifi,
@Assisted(ABOVE_STATUS_BAR) boolean aboveStatusBar,
@@ -218,8 +218,8 @@ public class InternetDialogDelegate implements
mHandler = handler;
mBackgroundExecutor = executor;
mInternetDialogManager = internetDialogManager;
- mInternetDialogController = internetDialogController;
- mDefaultDataSubId = mInternetDialogController.getDefaultDataSubscriptionId();
+ mInternetDetailsContentController = internetDetailsContentController;
+ mDefaultDataSubId = mInternetDetailsContentController.getDefaultDataSubscriptionId();
mCanConfigMobileData = canConfigMobileData;
mCanConfigWifi = canConfigWifi;
mCanChangeWifiState = WifiEnterpriseRestrictionUtils.isChangeWifiStateAllowed(context);
@@ -227,7 +227,7 @@ public class InternetDialogDelegate implements
mCoroutineScope = coroutineScope;
mUiEventLogger = uiEventLogger;
mDialogTransitionAnimator = dialogTransitionAnimator;
- mAdapter = new InternetAdapter(mInternetDialogController, coroutineScope);
+ mAdapter = new InternetAdapter(mInternetDetailsContentController, coroutineScope);
}
@Override
@@ -309,7 +309,8 @@ public class InternetDialogDelegate implements
setOnClickListener(dialog);
mTurnWifiOnLayout.setBackground(null);
mAirplaneModeButton.setVisibility(
- mInternetDialogController.isAirplaneModeEnabled() ? View.VISIBLE : View.GONE);
+ mInternetDetailsContentController.isAirplaneModeEnabled() ? View.VISIBLE
+ : View.GONE);
mWifiRecyclerView.setLayoutManager(new LinearLayoutManager(context));
mWifiRecyclerView.setAdapter(mAdapter);
@@ -324,7 +325,7 @@ public class InternetDialogDelegate implements
mLifecycleRegistry.setCurrentState(Lifecycle.State.RESUMED);
- mInternetDialogController.onStart(this, mCanConfigWifi);
+ mInternetDetailsContentController.onStart(this, mCanConfigWifi);
if (!mCanConfigWifi) {
hideWifiViews();
}
@@ -356,7 +357,7 @@ public class InternetDialogDelegate implements
mDoneButton.setOnClickListener(null);
mShareWifiButton.setOnClickListener(null);
mAirplaneModeButton.setOnClickListener(null);
- mInternetDialogController.onStop();
+ mInternetDetailsContentController.onStop();
mInternetDialogManager.destroyDialog();
}
@@ -413,18 +414,20 @@ public class InternetDialogDelegate implements
internetContent.mInternetDialogSubTitle = getSubtitleText();
if (shouldUpdateMobileNetwork) {
internetContent.mActiveNetworkIsCellular =
- mInternetDialogController.activeNetworkIsCellular();
+ mInternetDetailsContentController.activeNetworkIsCellular();
internetContent.mIsCarrierNetworkActive =
- mInternetDialogController.isCarrierNetworkActive();
- }
- internetContent.mIsAirplaneModeEnabled = mInternetDialogController.isAirplaneModeEnabled();
- internetContent.mHasEthernet = mInternetDialogController.hasEthernet();
- internetContent.mIsWifiEnabled = mInternetDialogController.isWifiEnabled();
- internetContent.mHasActiveSubIdOnDds = mInternetDialogController.hasActiveSubIdOnDds();
- internetContent.mIsDeviceLocked = mInternetDialogController.isDeviceLocked();
- internetContent.mIsWifiScanEnabled = mInternetDialogController.isWifiScanEnabled();
+ mInternetDetailsContentController.isCarrierNetworkActive();
+ }
+ internetContent.mIsAirplaneModeEnabled =
+ mInternetDetailsContentController.isAirplaneModeEnabled();
+ internetContent.mHasEthernet = mInternetDetailsContentController.hasEthernet();
+ internetContent.mIsWifiEnabled = mInternetDetailsContentController.isWifiEnabled();
+ internetContent.mHasActiveSubIdOnDds =
+ mInternetDetailsContentController.hasActiveSubIdOnDds();
+ internetContent.mIsDeviceLocked = mInternetDetailsContentController.isDeviceLocked();
+ internetContent.mIsWifiScanEnabled = mInternetDetailsContentController.isWifiScanEnabled();
internetContent.mActiveAutoSwitchNonDdsSubId =
- mInternetDialogController.getActiveAutoSwitchNonDdsSubId();
+ mInternetDetailsContentController.getActiveAutoSwitchNonDdsSubId();
return internetContent;
}
@@ -432,8 +435,8 @@ public class InternetDialogDelegate implements
InternetContent internetContent = new InternetContent();
internetContent.mInternetDialogTitleString = getDialogTitleText();
internetContent.mInternetDialogSubTitle = getSubtitleText();
- internetContent.mIsWifiEnabled = mInternetDialogController.isWifiEnabled();
- internetContent.mIsDeviceLocked = mInternetDialogController.isDeviceLocked();
+ internetContent.mIsWifiEnabled = mInternetDetailsContentController.isWifiEnabled();
+ internetContent.mIsDeviceLocked = mInternetDetailsContentController.isDeviceLocked();
return internetContent;
}
@@ -447,15 +450,15 @@ public class InternetDialogDelegate implements
if (autoSwitchNonDdsSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
showTurnOffAutoDataSwitchDialog(dialog, autoSwitchNonDdsSubId);
}
- mInternetDialogController.connectCarrierNetwork();
+ mInternetDetailsContentController.connectCarrierNetwork();
});
mMobileDataToggle.setOnClickListener(v -> {
boolean isChecked = mMobileDataToggle.isChecked();
if (!isChecked && shouldShowMobileDialog()) {
mMobileDataToggle.setChecked(true);
showTurnOffMobileDialog(dialog);
- } else if (mInternetDialogController.isMobileDataEnabled() != isChecked) {
- mInternetDialogController.setMobileDataEnabled(
+ } else if (mInternetDetailsContentController.isMobileDataEnabled() != isChecked) {
+ mInternetDetailsContentController.setMobileDataEnabled(
dialog.getContext(), mDefaultDataSubId, isChecked, false);
}
});
@@ -466,12 +469,13 @@ public class InternetDialogDelegate implements
});
mDoneButton.setOnClickListener(v -> dialog.dismiss());
mShareWifiButton.setOnClickListener(v -> {
- if (mInternetDialogController.mayLaunchShareWifiSettings(mConnectedWifiEntry, v)) {
+ if (mInternetDetailsContentController.mayLaunchShareWifiSettings(mConnectedWifiEntry,
+ v)) {
mUiEventLogger.log(InternetDialogEvent.SHARE_WIFI_QS_BUTTON_CLICKED);
}
});
mAirplaneModeButton.setOnClickListener(v -> {
- mInternetDialogController.setAirplaneModeDisabled();
+ mInternetDetailsContentController.setAirplaneModeDisabled();
});
}
@@ -495,10 +499,10 @@ public class InternetDialogDelegate implements
}
private void setWifiEnable(boolean isChecked) {
- if (mInternetDialogController.isWifiEnabled() == isChecked) {
+ if (mInternetDetailsContentController.isWifiEnabled() == isChecked) {
return;
}
- mInternetDialogController.setWifiEnabled(isChecked);
+ mInternetDetailsContentController.setWifiEnabled(isChecked);
}
@MainThread
@@ -534,7 +538,7 @@ public class InternetDialogDelegate implements
}
} else {
mMobileNetworkLayout.setVisibility(View.VISIBLE);
- mMobileDataToggle.setChecked(mInternetDialogController.isMobileDataEnabled());
+ mMobileDataToggle.setChecked(mInternetDetailsContentController.isMobileDataEnabled());
mMobileTitleText.setText(getMobileNetworkTitle(mDefaultDataSubId));
String summary = getMobileNetworkSummary(mDefaultDataSubId);
if (!TextUtils.isEmpty(summary)) {
@@ -679,10 +683,10 @@ public class InternetDialogDelegate implements
mConnectedWifiTitleText.setText(mConnectedWifiEntry.getTitle());
mConnectedWifiSummaryText.setText(mConnectedWifiEntry.getSummary(false));
mConnectedWifiIcon.setImageDrawable(
- mInternetDialogController.getInternetWifiDrawable(mConnectedWifiEntry));
+ mInternetDetailsContentController.getInternetWifiDrawable(mConnectedWifiEntry));
mWifiSettingsIcon.setColorFilter(
mDialog.getContext().getColor(R.color.connected_network_primary_color));
- if (mInternetDialogController.getConfiguratorQrCodeGeneratorIntentOrNull(
+ if (mInternetDetailsContentController.getConfiguratorQrCodeGeneratorIntentOrNull(
mConnectedWifiEntry) != null) {
mShareWifiButton.setVisibility(View.VISIBLE);
} else {
@@ -748,7 +752,7 @@ public class InternetDialogDelegate implements
if (TextUtils.isEmpty(mWifiScanNotifyText.getText())) {
final AnnotationLinkSpan.LinkInfo linkInfo = new AnnotationLinkSpan.LinkInfo(
AnnotationLinkSpan.LinkInfo.DEFAULT_ANNOTATION,
- mInternetDialogController::launchWifiScanningSetting);
+ mInternetDetailsContentController::launchWifiScanningSetting);
mWifiScanNotifyText.setText(AnnotationLinkSpan.linkify(
mDialog.getContext().getText(R.string.wifi_scan_notify_message), linkInfo));
mWifiScanNotifyText.setMovementMethod(LinkMovementMethod.getInstance());
@@ -760,37 +764,38 @@ public class InternetDialogDelegate implements
if (mConnectedWifiEntry == null) {
return;
}
- mInternetDialogController.launchWifiDetailsSetting(mConnectedWifiEntry.getKey(), view);
+ mInternetDetailsContentController.launchWifiDetailsSetting(mConnectedWifiEntry.getKey(),
+ view);
}
/** For DSDS auto data switch **/
void onClickConnectedSecondarySub(View view) {
- mInternetDialogController.launchMobileNetworkSettings(view);
+ mInternetDetailsContentController.launchMobileNetworkSettings(view);
}
void onClickSeeMoreButton(View view) {
- mInternetDialogController.launchNetworkSetting(view);
+ mInternetDetailsContentController.launchNetworkSetting(view);
}
CharSequence getDialogTitleText() {
- return mInternetDialogController.getDialogTitleText();
+ return mInternetDetailsContentController.getDialogTitleText();
}
@Nullable
CharSequence getSubtitleText() {
- return mInternetDialogController.getSubtitleText(mIsProgressBarVisible);
+ return mInternetDetailsContentController.getSubtitleText(mIsProgressBarVisible);
}
private Drawable getSignalStrengthDrawable(int subId) {
- return mInternetDialogController.getSignalStrengthDrawable(subId);
+ return mInternetDetailsContentController.getSignalStrengthDrawable(subId);
}
CharSequence getMobileNetworkTitle(int subId) {
- return mInternetDialogController.getMobileNetworkTitle(subId);
+ return mInternetDetailsContentController.getMobileNetworkTitle(subId);
}
String getMobileNetworkSummary(int subId) {
- return mInternetDialogController.getMobileNetworkSummary(subId);
+ return mInternetDetailsContentController.getMobileNetworkSummary(subId);
}
private void setProgressBarVisible(boolean visible) {
@@ -810,7 +815,7 @@ public class InternetDialogDelegate implements
}
boolean flag = Prefs.getBoolean(mDialog.getContext(), QS_HAS_TURNED_OFF_MOBILE_DATA,
false);
- if (mInternetDialogController.isMobileDataEnabled() && !flag) {
+ if (mInternetDetailsContentController.isMobileDataEnabled() && !flag) {
return true;
}
return false;
@@ -819,7 +824,8 @@ public class InternetDialogDelegate implements
private void showTurnOffMobileDialog(SystemUIDialog dialog) {
Context context = dialog.getContext();
CharSequence carrierName = getMobileNetworkTitle(mDefaultDataSubId);
- boolean isInService = mInternetDialogController.isVoiceStateInService(mDefaultDataSubId);
+ boolean isInService = mInternetDetailsContentController.isVoiceStateInService(
+ mDefaultDataSubId);
if (TextUtils.isEmpty(carrierName) || !isInService) {
carrierName = context.getString(R.string.mobile_data_disable_message_default_carrier);
}
@@ -831,7 +837,7 @@ public class InternetDialogDelegate implements
.setPositiveButton(
com.android.internal.R.string.alert_windows_notification_turn_off_action,
(d, w) -> {
- mInternetDialogController.setMobileDataEnabled(context,
+ mInternetDetailsContentController.setMobileDataEnabled(context,
mDefaultDataSubId, false, false);
mMobileDataToggle.setChecked(false);
Prefs.putBoolean(context, QS_HAS_TURNED_OFF_MOBILE_DATA, true);
@@ -858,7 +864,7 @@ public class InternetDialogDelegate implements
})
.setPositiveButton(R.string.auto_data_switch_dialog_positive_button,
(d, w) -> {
- mInternetDialogController
+ mInternetDetailsContentController
.setAutoDataSwitchMobileDataPolicy(subId, false);
if (mSecondaryMobileNetworkLayout != null) {
mSecondaryMobileNetworkLayout.setVisibility(View.GONE);
@@ -938,7 +944,7 @@ public class InternetDialogDelegate implements
@Nullable WifiEntry connectedEntry, boolean hasMoreWifiEntries) {
// Should update the carrier network layout when it is connected under airplane mode ON.
boolean shouldUpdateCarrierNetwork = mMobileNetworkLayout.getVisibility() == View.VISIBLE
- && mInternetDialogController.isAirplaneModeEnabled();
+ && mInternetDetailsContentController.isAirplaneModeEnabled();
mHandler.post(() -> {
mConnectedWifiEntry = connectedEntry;
mWifiEntriesCount = wifiEntries == null ? 0 : wifiEntries.size();
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentControllerTest.java
index 782b24825bcf..e4a4953063bb 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentControllerTest.java
@@ -9,8 +9,8 @@ import static android.telephony.SubscriptionManager.PROFILE_CLASS_PROVISIONING;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
import static com.android.settingslib.wifi.WifiUtils.getHotspotIconResource;
-import static com.android.systemui.qs.tiles.dialog.InternetDialogController.TOAST_PARAMS_HORIZONTAL_WEIGHT;
-import static com.android.systemui.qs.tiles.dialog.InternetDialogController.TOAST_PARAMS_VERTICAL_WEIGHT;
+import static com.android.systemui.qs.tiles.dialog.InternetDetailsContentController.TOAST_PARAMS_HORIZONTAL_WEIGHT;
+import static com.android.systemui.qs.tiles.dialog.InternetDetailsContentController.TOAST_PARAMS_VERTICAL_WEIGHT;
import static com.android.wifitrackerlib.WifiEntry.WIFI_LEVEL_MAX;
import static com.android.wifitrackerlib.WifiEntry.WIFI_LEVEL_MIN;
import static com.android.wifitrackerlib.WifiEntry.WIFI_LEVEL_UNREACHABLE;
@@ -105,7 +105,7 @@ import java.util.Map;
@SmallTest
@RunWith(AndroidJUnit4.class)
@TestableLooper.RunWithLooper(setAsMainLooper = true)
-public class InternetDialogDelegateControllerTest extends SysuiTestCase {
+public class InternetDetailsContentControllerTest extends SysuiTestCase {
private static final int SUB_ID = 1;
private static final int SUB_ID2 = 2;
@@ -160,7 +160,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
@Mock
private WifiUtils.InternetIconInjector mWifiIconInjector;
@Mock
- InternetDialogController.InternetDialogCallback mInternetDialogCallback;
+ InternetDetailsContentController.InternetDialogCallback mInternetDialogCallback;
@Mock
private ViewCaptureAwareWindowManager mWindowManager;
@Mock
@@ -189,7 +189,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
private FakeFeatureFlags mFlags = new FakeFeatureFlags();
private TestableResources mTestableResources;
- private InternetDialogController mInternetDialogController;
+ private InternetDetailsContentController mInternetDetailsContentController;
private FakeExecutor mExecutor = new FakeExecutor(new FakeSystemClock());
private List<WifiEntry> mAccessPoints = new ArrayList<>();
private List<WifiEntry> mWifiEntries = new ArrayList<>();
@@ -229,7 +229,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
when(mSystemUIToast.getInAnimation()).thenReturn(mAnimator);
when(mWifiStateWorker.isWifiEnabled()).thenReturn(true);
- mInternetDialogController = new InternetDialogController(mContext,
+ mInternetDetailsContentController = new InternetDetailsContentController(mContext,
mock(UiEventLogger.class), mock(ActivityStarter.class), mAccessPointController,
mSubscriptionManager, mTelephonyManager, mWifiManager,
mConnectivityManager, mHandler, mExecutor, mBroadcastDispatcher,
@@ -238,11 +238,11 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
mCarrierConfigTracker, mLocationController, mDialogTransitionAnimator,
mWifiStateWorker, mFlags);
mSubscriptionManager.addOnSubscriptionsChangedListener(mExecutor,
- mInternetDialogController.mOnSubscriptionsChangedListener);
- mInternetDialogController.onStart(mInternetDialogCallback, true);
- mInternetDialogController.onAccessPointsChanged(mAccessPoints);
- mInternetDialogController.mActivityStarter = mActivityStarter;
- mInternetDialogController.mWifiIconInjector = mWifiIconInjector;
+ mInternetDetailsContentController.mOnSubscriptionsChangedListener);
+ mInternetDetailsContentController.onStart(mInternetDialogCallback, true);
+ mInternetDetailsContentController.onAccessPointsChanged(mAccessPoints);
+ mInternetDetailsContentController.mActivityStarter = mActivityStarter;
+ mInternetDetailsContentController.mWifiIconInjector = mWifiIconInjector;
mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, false);
mFlags.set(Flags.SHARE_WIFI_QS_BUTTON, false);
@@ -260,7 +260,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
@Test
public void connectCarrierNetwork_mergedCarrierEntryCanConnect_connectAndCreateSysUiToast() {
- InternetDialogController spyController = spy(mInternetDialogController);
+ InternetDetailsContentController spyController = spy(mInternetDetailsContentController);
when(spyController.isMobileDataEnabled()).thenReturn(true);
when(mKeyguardStateController.isUnlocked()).thenReturn(true);
when(mConnectivityManager.getActiveNetwork()).thenReturn(mNetwork);
@@ -282,7 +282,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
@Test
public void connectCarrierNetwork_mergedCarrierEntryCanConnect_doNothingWhenSettingsOff() {
- InternetDialogController spyController = spy(mInternetDialogController);
+ InternetDetailsContentController spyController = spy(mInternetDetailsContentController);
when(spyController.isMobileDataEnabled()).thenReturn(false);
mTestableResources.addOverride(R.string.wifi_wont_autoconnect_for_now,
TOAST_MESSAGE_STRING);
@@ -296,7 +296,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
@Test
public void connectCarrierNetwork_mergedCarrierEntryCanConnect_doNothingWhenKeyguardLocked() {
- InternetDialogController spyController = spy(mInternetDialogController);
+ InternetDetailsContentController spyController = spy(mInternetDetailsContentController);
when(spyController.isMobileDataEnabled()).thenReturn(true);
when(mKeyguardStateController.isUnlocked()).thenReturn(false);
@@ -311,8 +311,6 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
@Test
public void connectCarrierNetwork_mergedCarrierEntryCanConnect_doNothingWhenMobileIsPrimary() {
- InternetDialogController spyController = spy(mInternetDialogController);
- when(spyController.isMobileDataEnabled()).thenReturn(true);
when(mKeyguardStateController.isUnlocked()).thenReturn(true);
when(mConnectivityManager.getActiveNetwork()).thenReturn(mNetwork);
when(mConnectivityManager.getNetworkCapabilities(mNetwork))
@@ -322,7 +320,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
mTestableResources.addOverride(R.string.wifi_wont_autoconnect_for_now,
TOAST_MESSAGE_STRING);
- mInternetDialogController.connectCarrierNetwork();
+ mInternetDetailsContentController.connectCarrierNetwork();
verify(mMergedCarrierEntry, never()).connect(null /* callback */, false /* showToast */);
verify(mToastFactory, never()).createToast(any(), any(), anyString(), anyString(), anyInt(),
@@ -333,7 +331,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
public void makeOverlayToast_withGravityFlags_addViewWithLayoutParams() {
mTestableResources.addOverride(TOAST_MESSAGE_STRING_ID, TOAST_MESSAGE_STRING);
- mInternetDialogController.makeOverlayToast(TOAST_MESSAGE_STRING_ID);
+ mInternetDetailsContentController.makeOverlayToast(TOAST_MESSAGE_STRING_ID);
ArgumentCaptor<WindowManager.LayoutParams> paramsCaptor = ArgumentCaptor.forClass(
WindowManager.LayoutParams.class);
@@ -349,7 +347,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
public void makeOverlayToast_withAnimation_verifyAnimatorStart() {
mTestableResources.addOverride(TOAST_MESSAGE_STRING_ID, TOAST_MESSAGE_STRING);
- mInternetDialogController.makeOverlayToast(TOAST_MESSAGE_STRING_ID);
+ mInternetDetailsContentController.makeOverlayToast(TOAST_MESSAGE_STRING_ID);
verify(mAnimator).start();
}
@@ -358,7 +356,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
public void getDialogTitleText_withAirplaneModeOn_returnAirplaneMode() {
fakeAirplaneModeEnabled(true);
- assertTrue(TextUtils.equals(mInternetDialogController.getDialogTitleText(),
+ assertTrue(TextUtils.equals(mInternetDetailsContentController.getDialogTitleText(),
getResourcesString("airplane_mode")));
}
@@ -366,7 +364,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
public void getDialogTitleText_withAirplaneModeOff_returnInternet() {
fakeAirplaneModeEnabled(false);
- assertTrue(TextUtils.equals(mInternetDialogController.getDialogTitleText(),
+ assertTrue(TextUtils.equals(mInternetDetailsContentController.getDialogTitleText(),
getResourcesString("quick_settings_internet_label")));
}
@@ -375,13 +373,13 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
fakeAirplaneModeEnabled(true);
when(mWifiStateWorker.isWifiEnabled()).thenReturn(false);
- assertThat(mInternetDialogController.getSubtitleText(false))
+ assertThat(mInternetDetailsContentController.getSubtitleText(false))
.isEqualTo(getResourcesString("wifi_is_off"));
// if the Wi-Fi disallow config, then don't return Wi-Fi related string.
- mInternetDialogController.mCanConfigWifi = false;
+ mInternetDetailsContentController.mCanConfigWifi = false;
- assertThat(mInternetDialogController.getSubtitleText(false))
+ assertThat(mInternetDetailsContentController.getSubtitleText(false))
.isNotEqualTo(getResourcesString("wifi_is_off"));
}
@@ -390,13 +388,13 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
fakeAirplaneModeEnabled(false);
when(mWifiStateWorker.isWifiEnabled()).thenReturn(false);
- assertThat(mInternetDialogController.getSubtitleText(false))
+ assertThat(mInternetDetailsContentController.getSubtitleText(false))
.isEqualTo(getResourcesString("wifi_is_off"));
// if the Wi-Fi disallow config, then don't return Wi-Fi related string.
- mInternetDialogController.mCanConfigWifi = false;
+ mInternetDetailsContentController.mCanConfigWifi = false;
- assertThat(mInternetDialogController.getSubtitleText(false))
+ assertThat(mInternetDetailsContentController.getSubtitleText(false))
.isNotEqualTo(getResourcesString("wifi_is_off"));
}
@@ -404,15 +402,15 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
public void getSubtitleText_withNoWifiEntry_returnSearchWifi() {
fakeAirplaneModeEnabled(false);
when(mWifiStateWorker.isWifiEnabled()).thenReturn(true);
- mInternetDialogController.onAccessPointsChanged(null /* accessPoints */);
+ mInternetDetailsContentController.onAccessPointsChanged(null /* accessPoints */);
- assertThat(mInternetDialogController.getSubtitleText(true))
+ assertThat(mInternetDetailsContentController.getSubtitleText(true))
.isEqualTo(getResourcesString("wifi_empty_list_wifi_on"));
// if the Wi-Fi disallow config, then don't return Wi-Fi related string.
- mInternetDialogController.mCanConfigWifi = false;
+ mInternetDetailsContentController.mCanConfigWifi = false;
- assertThat(mInternetDialogController.getSubtitleText(true))
+ assertThat(mInternetDetailsContentController.getSubtitleText(true))
.isNotEqualTo(getResourcesString("wifi_empty_list_wifi_on"));
}
@@ -422,13 +420,13 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
fakeAirplaneModeEnabled(false);
when(mWifiStateWorker.isWifiEnabled()).thenReturn(true);
- assertThat(mInternetDialogController.getSubtitleText(false))
+ assertThat(mInternetDetailsContentController.getSubtitleText(false))
.isEqualTo(getResourcesString("tap_a_network_to_connect"));
// if the Wi-Fi disallow config, then don't return Wi-Fi related string.
- mInternetDialogController.mCanConfigWifi = false;
+ mInternetDetailsContentController.mCanConfigWifi = false;
- assertThat(mInternetDialogController.getSubtitleText(false))
+ assertThat(mInternetDetailsContentController.getSubtitleText(false))
.isNotEqualTo(getResourcesString("tap_a_network_to_connect"));
}
@@ -438,14 +436,14 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
when(mWifiStateWorker.isWifiEnabled()).thenReturn(true);
when(mKeyguardStateController.isUnlocked()).thenReturn(false);
- assertTrue(TextUtils.equals(mInternetDialogController.getSubtitleText(false),
+ assertTrue(TextUtils.equals(mInternetDetailsContentController.getSubtitleText(false),
getResourcesString("unlock_to_view_networks")));
}
@Test
public void getSubtitleText_withNoService_returnNoNetworksAvailable() {
mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);
- InternetDialogController spyController = spy(mInternetDialogController);
+ InternetDetailsContentController spyController = spy(mInternetDetailsContentController);
fakeAirplaneModeEnabled(false);
when(mWifiStateWorker.isWifiEnabled()).thenReturn(true);
spyController.onAccessPointsChanged(null /* accessPoints */);
@@ -466,7 +464,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
@Test
public void getSubtitleText_withNoService_returnNoNetworksAvailable_flagOff() {
- InternetDialogController spyController = spy(mInternetDialogController);
+ InternetDetailsContentController spyController = spy(mInternetDetailsContentController);
fakeAirplaneModeEnabled(false);
when(mWifiStateWorker.isWifiEnabled()).thenReturn(true);
spyController.onAccessPointsChanged(null /* accessPoints */);
@@ -488,22 +486,22 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
public void getSubtitleText_withMobileDataDisabled_returnNoOtherAvailable() {
fakeAirplaneModeEnabled(false);
when(mWifiStateWorker.isWifiEnabled()).thenReturn(true);
- mInternetDialogController.onAccessPointsChanged(null /* accessPoints */);
- InternetDialogController spyController = spy(mInternetDialogController);
+ mInternetDetailsContentController.onAccessPointsChanged(null /* accessPoints */);
+ InternetDetailsContentController spyController = spy(mInternetDetailsContentController);
doReturn(ServiceState.STATE_IN_SERVICE).when(mServiceState).getState();
spyController.mSubIdServiceState.put(SUB_ID, mServiceState);
- assertThat(mInternetDialogController.getSubtitleText(false))
+ assertThat(mInternetDetailsContentController.getSubtitleText(false))
.isEqualTo(getResourcesString("non_carrier_network_unavailable"));
// if the Wi-Fi disallow config, then don't return Wi-Fi related string.
- mInternetDialogController.mCanConfigWifi = false;
+ mInternetDetailsContentController.mCanConfigWifi = false;
when(spyController.isMobileDataEnabled()).thenReturn(false);
- assertThat(mInternetDialogController.getSubtitleText(false))
+ assertThat(mInternetDetailsContentController.getSubtitleText(false))
.isNotEqualTo(getResourcesString("non_carrier_network_unavailable"));
}
@@ -511,21 +509,22 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
public void getSubtitleText_withCarrierNetworkActiveOnly_returnNoOtherAvailable() {
fakeAirplaneModeEnabled(false);
when(mWifiStateWorker.isWifiEnabled()).thenReturn(true);
- mInternetDialogController.onAccessPointsChanged(null /* accessPoints */);
+ mInternetDetailsContentController.onAccessPointsChanged(null /* accessPoints */);
when(mMergedCarrierEntry.isDefaultNetwork()).thenReturn(true);
- assertThat(mInternetDialogController.getSubtitleText(false))
+ assertThat(mInternetDetailsContentController.getSubtitleText(false))
.isEqualTo(getResourcesString("non_carrier_network_unavailable"));
}
@Test
public void getWifiDetailsSettingsIntent_withNoKey_returnNull() {
- assertThat(mInternetDialogController.getWifiDetailsSettingsIntent(null)).isNull();
+ assertThat(mInternetDetailsContentController.getWifiDetailsSettingsIntent(null)).isNull();
}
@Test
public void getWifiDetailsSettingsIntent_withKey_returnIntent() {
- assertThat(mInternetDialogController.getWifiDetailsSettingsIntent("test_key")).isNotNull();
+ assertThat(mInternetDetailsContentController.getWifiDetailsSettingsIntent(
+ "test_key")).isNotNull();
}
@Test
@@ -533,7 +532,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
final Drawable drawable = mock(Drawable.class);
when(mWifiIconInjector.getIcon(anyBoolean(), anyInt())).thenReturn(drawable);
- mInternetDialogController.getInternetWifiDrawable(mConnectedEntry);
+ mInternetDetailsContentController.getInternetWifiDrawable(mConnectedEntry);
verify(mWifiIconInjector).getIcon(eq(false), anyInt());
verify(drawable).setTint(mContext.getColor(R.color.connected_network_primary_color));
@@ -543,7 +542,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
public void getWifiDrawable_withWifiLevelUnreachable_returnNull() {
when(mConnectedEntry.getLevel()).thenReturn(WIFI_LEVEL_UNREACHABLE);
- assertThat(mInternetDialogController.getWifiDrawable(mConnectedEntry)).isNull();
+ assertThat(mInternetDetailsContentController.getWifiDrawable(mConnectedEntry)).isNull();
}
@Test
@@ -553,19 +552,21 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
Drawable hotspotDrawable = mock(Drawable.class);
mTestableResources.addOverride(getHotspotIconResource(DEVICE_TYPE_PHONE), hotspotDrawable);
- assertThat(mInternetDialogController.getWifiDrawable(entry)).isEqualTo(hotspotDrawable);
+ assertThat(mInternetDetailsContentController.getWifiDrawable(entry)).isEqualTo(
+ hotspotDrawable);
}
@Test
public void startActivityForDialog_always_startActivityWithoutDismissShade() {
- mInternetDialogController.startActivityForDialog(mock(Intent.class));
+ mInternetDetailsContentController.startActivityForDialog(mock(Intent.class));
verify(mActivityStarter).startActivity(any(Intent.class), eq(false) /* dismissShade */);
}
@Test
public void launchWifiDetailsSetting_withNoWifiEntryKey_doNothing() {
- mInternetDialogController.launchWifiDetailsSetting(null /* key */, mDialogLaunchView);
+ mInternetDetailsContentController.launchWifiDetailsSetting(null /* key */,
+ mDialogLaunchView);
verify(mActivityStarter, never())
.postStartActivityDismissingKeyguard(any(Intent.class), anyInt());
@@ -573,7 +574,8 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
@Test
public void launchWifiDetailsSetting_withWifiEntryKey_startActivity() {
- mInternetDialogController.launchWifiDetailsSetting("wifi_entry_key", mDialogLaunchView);
+ mInternetDetailsContentController.launchWifiDetailsSetting("wifi_entry_key",
+ mDialogLaunchView);
verify(mActivityStarter).postStartActivityDismissingKeyguard(any(Intent.class), anyInt(),
any());
@@ -583,22 +585,22 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
public void isDeviceLocked_keyguardIsUnlocked_returnFalse() {
when(mKeyguardStateController.isUnlocked()).thenReturn(true);
- assertThat(mInternetDialogController.isDeviceLocked()).isFalse();
+ assertThat(mInternetDetailsContentController.isDeviceLocked()).isFalse();
}
@Test
public void isDeviceLocked_keyguardIsLocked_returnTrue() {
when(mKeyguardStateController.isUnlocked()).thenReturn(false);
- assertThat(mInternetDialogController.isDeviceLocked()).isTrue();
+ assertThat(mInternetDetailsContentController.isDeviceLocked()).isTrue();
}
@Test
public void onAccessPointsChanged_canNotConfigWifi_doNothing() {
reset(mInternetDialogCallback);
- mInternetDialogController.mCanConfigWifi = false;
+ mInternetDetailsContentController.mCanConfigWifi = false;
- mInternetDialogController.onAccessPointsChanged(null /* accessPoints */);
+ mInternetDetailsContentController.onAccessPointsChanged(null /* accessPoints */);
verify(mInternetDialogCallback, never()).onAccessPointsChanged(any(), any(), anyBoolean());
}
@@ -607,7 +609,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
public void onAccessPointsChanged_nullAccessPoints_callbackBothNull() {
reset(mInternetDialogCallback);
- mInternetDialogController.onAccessPointsChanged(null /* accessPoints */);
+ mInternetDetailsContentController.onAccessPointsChanged(null /* accessPoints */);
verify(mInternetDialogCallback).onAccessPointsChanged(null /* wifiEntries */,
null /* connectedEntry */, false /* hasMoreEntry */);
@@ -619,7 +621,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
mAccessPoints.clear();
mAccessPoints.add(mConnectedEntry);
- mInternetDialogController.onAccessPointsChanged(mAccessPoints);
+ mInternetDetailsContentController.onAccessPointsChanged(mAccessPoints);
mWifiEntries.clear();
verify(mInternetDialogCallback).onAccessPointsChanged(mWifiEntries, mConnectedEntry,
@@ -632,7 +634,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
mAccessPoints.clear();
mAccessPoints.add(mWifiEntry1);
- mInternetDialogController.onAccessPointsChanged(mAccessPoints);
+ mInternetDetailsContentController.onAccessPointsChanged(mAccessPoints);
mWifiEntries.clear();
mWifiEntries.add(mWifiEntry1);
@@ -647,7 +649,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
mAccessPoints.add(mConnectedEntry);
mAccessPoints.add(mWifiEntry1);
- mInternetDialogController.onAccessPointsChanged(mAccessPoints);
+ mInternetDetailsContentController.onAccessPointsChanged(mAccessPoints);
mWifiEntries.clear();
mWifiEntries.add(mWifiEntry1);
@@ -663,7 +665,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
mAccessPoints.add(mWifiEntry1);
mAccessPoints.add(mWifiEntry2);
- mInternetDialogController.onAccessPointsChanged(mAccessPoints);
+ mInternetDetailsContentController.onAccessPointsChanged(mAccessPoints);
mWifiEntries.clear();
mWifiEntries.add(mWifiEntry1);
@@ -681,7 +683,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
mAccessPoints.add(mWifiEntry2);
mAccessPoints.add(mWifiEntry3);
- mInternetDialogController.onAccessPointsChanged(mAccessPoints);
+ mInternetDetailsContentController.onAccessPointsChanged(mAccessPoints);
mWifiEntries.clear();
mWifiEntries.add(mWifiEntry1);
@@ -699,7 +701,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
mAccessPoints.add(mWifiEntry3);
mAccessPoints.add(mWifiEntry4);
- mInternetDialogController.onAccessPointsChanged(mAccessPoints);
+ mInternetDetailsContentController.onAccessPointsChanged(mAccessPoints);
mWifiEntries.clear();
mWifiEntries.add(mWifiEntry1);
@@ -718,7 +720,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
when(mWifiEntry1.hasInternetAccess()).thenReturn(false);
mAccessPoints.add(mWifiEntry1);
- mInternetDialogController.onAccessPointsChanged(mAccessPoints);
+ mInternetDetailsContentController.onAccessPointsChanged(mAccessPoints);
mWifiEntries.clear();
mWifiEntries.add(mWifiEntry1);
@@ -735,9 +737,10 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
when(mWifiEntry1.hasInternetAccess()).thenReturn(false);
mAccessPoints.add(mWifiEntry1);
- mInternetDialogController.onAccessPointsChanged(mAccessPoints);
+ mInternetDetailsContentController.onAccessPointsChanged(mAccessPoints);
- verify(mWifiEntry1).setListener(mInternetDialogController.mConnectedWifiInternetMonitor);
+ verify(mWifiEntry1).setListener(
+ mInternetDetailsContentController.mConnectedWifiInternetMonitor);
}
@Test
@@ -746,8 +749,9 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
when(mWifiEntry1.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTED);
when(mWifiEntry1.isDefaultNetwork()).thenReturn(true);
when(mWifiEntry1.hasInternetAccess()).thenReturn(false);
- InternetDialogController.ConnectedWifiInternetMonitor mConnectedWifiInternetMonitor =
- mInternetDialogController.mConnectedWifiInternetMonitor;
+ InternetDetailsContentController.ConnectedWifiInternetMonitor
+ mConnectedWifiInternetMonitor =
+ mInternetDetailsContentController.mConnectedWifiInternetMonitor;
mConnectedWifiInternetMonitor.registerCallbackIfNeed(mWifiEntry1);
// When the hasInternetAccess() changed to true, and call back the onUpdated() function.
@@ -762,7 +766,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
reset(mInternetDialogCallback);
when(mWifiStateWorker.isWifiEnabled()).thenReturn(false);
- mInternetDialogController.onWifiScan(true);
+ mInternetDetailsContentController.onWifiScan(true);
verify(mInternetDialogCallback).onWifiScan(false);
}
@@ -772,7 +776,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
reset(mInternetDialogCallback);
when(mKeyguardStateController.isUnlocked()).thenReturn(false);
- mInternetDialogController.onWifiScan(true);
+ mInternetDetailsContentController.onWifiScan(true);
verify(mInternetDialogCallback).onWifiScan(false);
}
@@ -781,7 +785,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
public void onWifiScan_onWifiScanFalse_callbackOnWifiScanFalse() {
reset(mInternetDialogCallback);
- mInternetDialogController.onWifiScan(false);
+ mInternetDetailsContentController.onWifiScan(false);
verify(mInternetDialogCallback).onWifiScan(false);
}
@@ -790,7 +794,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
public void onWifiScan_onWifiScanTrue_callbackOnWifiScanTrue() {
reset(mInternetDialogCallback);
- mInternetDialogController.onWifiScan(true);
+ mInternetDetailsContentController.onWifiScan(true);
verify(mInternetDialogCallback).onWifiScan(true);
}
@@ -800,7 +804,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
when(mCarrierConfigTracker.getCarrierProvisionsWifiMergedNetworksBool(SUB_ID))
.thenReturn(true);
- mInternetDialogController.setMergedCarrierWifiEnabledIfNeed(SUB_ID, true);
+ mInternetDetailsContentController.setMergedCarrierWifiEnabledIfNeed(SUB_ID, true);
verify(mMergedCarrierEntry, never()).setEnabled(anyBoolean());
}
@@ -811,7 +815,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
.thenReturn(false);
when(mAccessPointController.getMergedCarrierEntry()).thenReturn(null);
- mInternetDialogController.setMergedCarrierWifiEnabledIfNeed(SUB_ID, true);
+ mInternetDetailsContentController.setMergedCarrierWifiEnabledIfNeed(SUB_ID, true);
}
@Test
@@ -819,11 +823,11 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
when(mCarrierConfigTracker.getCarrierProvisionsWifiMergedNetworksBool(SUB_ID))
.thenReturn(false);
- mInternetDialogController.setMergedCarrierWifiEnabledIfNeed(SUB_ID, true);
+ mInternetDetailsContentController.setMergedCarrierWifiEnabledIfNeed(SUB_ID, true);
verify(mMergedCarrierEntry).setEnabled(true);
- mInternetDialogController.setMergedCarrierWifiEnabledIfNeed(SUB_ID, false);
+ mInternetDetailsContentController.setMergedCarrierWifiEnabledIfNeed(SUB_ID, false);
verify(mMergedCarrierEntry).setEnabled(false);
}
@@ -833,11 +837,11 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
when(mLocationController.isLocationEnabled()).thenReturn(false);
when(mWifiManager.isScanAlwaysAvailable()).thenReturn(false);
- assertThat(mInternetDialogController.isWifiScanEnabled()).isFalse();
+ assertThat(mInternetDetailsContentController.isWifiScanEnabled()).isFalse();
when(mWifiManager.isScanAlwaysAvailable()).thenReturn(true);
- assertThat(mInternetDialogController.isWifiScanEnabled()).isFalse();
+ assertThat(mInternetDetailsContentController.isWifiScanEnabled()).isFalse();
}
@Test
@@ -845,17 +849,17 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
when(mLocationController.isLocationEnabled()).thenReturn(true);
when(mWifiManager.isScanAlwaysAvailable()).thenReturn(false);
- assertThat(mInternetDialogController.isWifiScanEnabled()).isFalse();
+ assertThat(mInternetDetailsContentController.isWifiScanEnabled()).isFalse();
when(mWifiManager.isScanAlwaysAvailable()).thenReturn(true);
- assertThat(mInternetDialogController.isWifiScanEnabled()).isTrue();
+ assertThat(mInternetDetailsContentController.isWifiScanEnabled()).isTrue();
}
@Test
public void getSignalStrengthIcon_differentSubId() {
mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);
- InternetDialogController spyController = spy(mInternetDialogController);
+ InternetDetailsContentController spyController = spy(mInternetDetailsContentController);
Drawable icons = spyController.getSignalStrengthIcon(SUB_ID, mContext, 1, 1, 0, false);
Drawable icons2 = spyController.getSignalStrengthIcon(SUB_ID2, mContext, 1, 1, 0, false);
@@ -870,12 +874,12 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
doReturn(SUB_ID2).when(info).getSubscriptionId();
when(mSubscriptionManager.getActiveSubscriptionInfo(anyInt())).thenReturn(info);
- int subId = mInternetDialogController.getActiveAutoSwitchNonDdsSubId();
+ int subId = mInternetDetailsContentController.getActiveAutoSwitchNonDdsSubId();
assertThat(subId).isEqualTo(SUB_ID2);
// active on CBRS
doReturn(true).when(info).isOpportunistic();
- subId = mInternetDialogController.getActiveAutoSwitchNonDdsSubId();
+ subId = mInternetDetailsContentController.getActiveAutoSwitchNonDdsSubId();
assertThat(subId).isEqualTo(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
// active on DDS
@@ -883,7 +887,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
doReturn(SUB_ID).when(info).getSubscriptionId();
when(mSubscriptionManager.getActiveSubscriptionInfo(anyInt())).thenReturn(info);
- subId = mInternetDialogController.getActiveAutoSwitchNonDdsSubId();
+ subId = mInternetDetailsContentController.getActiveAutoSwitchNonDdsSubId();
assertThat(subId).isEqualTo(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
}
@@ -894,7 +898,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
doReturn(SUB_ID2).when(info).getSubscriptionId();
when(mSubscriptionManager.getActiveSubscriptionInfo(anyInt())).thenReturn(info);
- int subId = mInternetDialogController.getActiveAutoSwitchNonDdsSubId();
+ int subId = mInternetDetailsContentController.getActiveAutoSwitchNonDdsSubId();
assertThat(subId).isEqualTo(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
}
@@ -908,22 +912,24 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
doReturn(false).when(info).isOpportunistic();
when(mSubscriptionManager.getActiveSubscriptionInfo(anyInt())).thenReturn(info);
- mInternetDialogController.getActiveAutoSwitchNonDdsSubId();
+ mInternetDetailsContentController.getActiveAutoSwitchNonDdsSubId();
// 1st time is onStart(), 2nd time is getActiveAutoSwitchNonDdsSubId()
verify(mTelephonyManager, times(2)).registerTelephonyCallback(any(), any());
- assertThat(mInternetDialogController.mSubIdTelephonyCallbackMap.size()).isEqualTo(2);
+ assertThat(mInternetDetailsContentController.mSubIdTelephonyCallbackMap.size()).isEqualTo(
+ 2);
// Adds non DDS subId again
doReturn(SUB_ID2).when(info).getSubscriptionId();
doReturn(false).when(info).isOpportunistic();
when(mSubscriptionManager.getActiveSubscriptionInfo(anyInt())).thenReturn(info);
- mInternetDialogController.getActiveAutoSwitchNonDdsSubId();
+ mInternetDetailsContentController.getActiveAutoSwitchNonDdsSubId();
// Does not add due to cached subInfo in mSubIdTelephonyCallbackMap.
verify(mTelephonyManager, times(2)).registerTelephonyCallback(any(), any());
- assertThat(mInternetDialogController.mSubIdTelephonyCallbackMap.size()).isEqualTo(2);
+ assertThat(mInternetDetailsContentController.mSubIdTelephonyCallbackMap.size()).isEqualTo(
+ 2);
}
@Test
@@ -936,7 +942,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
when(SubscriptionManager.getResourcesForSubId(any(), eq(SUB_ID))).thenReturn(res1);
when(SubscriptionManager.getResourcesForSubId(any(), eq(SUB_ID2))).thenReturn(res2);
- InternetDialogController spyController = spy(mInternetDialogController);
+ InternetDetailsContentController spyController = spy(mInternetDetailsContentController);
Map<Integer, TelephonyDisplayInfo> mSubIdTelephonyDisplayInfoMap =
spyController.mSubIdTelephonyDisplayInfoMap;
TelephonyDisplayInfo info1 = new TelephonyDisplayInfo(TelephonyManager.NETWORK_TYPE_EDGE,
@@ -961,7 +967,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
@Test
public void getMobileNetworkSummary_flagOff() {
- InternetDialogController spyController = spy(mInternetDialogController);
+ InternetDetailsContentController spyController = spy(mInternetDetailsContentController);
doReturn(true).when(spyController).isMobileDataEnabled();
doReturn(true).when(spyController).activeNetworkIsCellular();
String dds = spyController.getMobileNetworkSummary(SUB_ID);
@@ -972,7 +978,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
@Test
public void launchMobileNetworkSettings_validSubId() {
mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);
- InternetDialogController spyController = spy(mInternetDialogController);
+ InternetDetailsContentController spyController = spy(mInternetDetailsContentController);
doReturn(SUB_ID2).when(spyController).getActiveAutoSwitchNonDdsSubId();
spyController.launchMobileNetworkSettings(mDialogLaunchView);
@@ -983,7 +989,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
@Test
public void launchMobileNetworkSettings_invalidSubId() {
mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);
- InternetDialogController spyController = spy(mInternetDialogController);
+ InternetDetailsContentController spyController = spy(mInternetDetailsContentController);
doReturn(SubscriptionManager.INVALID_SUBSCRIPTION_ID)
.when(spyController).getActiveAutoSwitchNonDdsSubId();
spyController.launchMobileNetworkSettings(mDialogLaunchView);
@@ -995,7 +1001,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
@Test
public void setAutoDataSwitchMobileDataPolicy() {
mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, true);
- mInternetDialogController.setAutoDataSwitchMobileDataPolicy(SUB_ID, true);
+ mInternetDetailsContentController.setAutoDataSwitchMobileDataPolicy(SUB_ID, true);
verify(mTelephonyManager).setMobileDataPolicyEnabled(eq(
TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH), eq(true));
@@ -1006,9 +1012,9 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
// Fake mobile data level as SIGNAL_STRENGTH_POOR(1)
when(mSignalStrength.getLevel()).thenReturn(SIGNAL_STRENGTH_POOR);
// Fake carrier network level as WIFI_LEVEL_MAX(4)
- when(mInternetDialogController.getCarrierNetworkLevel()).thenReturn(WIFI_LEVEL_MAX);
+ when(mInternetDetailsContentController.getCarrierNetworkLevel()).thenReturn(WIFI_LEVEL_MAX);
- InternetDialogController spyController = spy(mInternetDialogController);
+ InternetDetailsContentController spyController = spy(mInternetDetailsContentController);
spyController.getSignalStrengthDrawableWithLevel(false /* isCarrierNetworkActive */, 0);
verify(spyController).getSignalStrengthIcon(eq(0), any(), eq(SIGNAL_STRENGTH_POOR),
@@ -1020,9 +1026,9 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
// Fake mobile data level as SIGNAL_STRENGTH_POOR(1)
when(mSignalStrength.getLevel()).thenReturn(SIGNAL_STRENGTH_POOR);
// Fake carrier network level as WIFI_LEVEL_MAX(4)
- when(mInternetDialogController.getCarrierNetworkLevel()).thenReturn(WIFI_LEVEL_MAX);
+ when(mInternetDetailsContentController.getCarrierNetworkLevel()).thenReturn(WIFI_LEVEL_MAX);
- InternetDialogController spyController = spy(mInternetDialogController);
+ InternetDetailsContentController spyController = spy(mInternetDetailsContentController);
spyController.getSignalStrengthDrawableWithLevel(true /* isCarrierNetworkActive */, 0);
verify(spyController).getSignalStrengthIcon(eq(0), any(), eq(WIFI_LEVEL_MAX),
@@ -1033,14 +1039,16 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
public void getCarrierNetworkLevel_mergedCarrierEntryIsNull_returnMinLevel() {
when(mAccessPointController.getMergedCarrierEntry()).thenReturn(null);
- assertThat(mInternetDialogController.getCarrierNetworkLevel()).isEqualTo(WIFI_LEVEL_MIN);
+ assertThat(mInternetDetailsContentController.getCarrierNetworkLevel()).isEqualTo(
+ WIFI_LEVEL_MIN);
}
@Test
public void getCarrierNetworkLevel_getUnreachableLevel_returnMinLevel() {
when(mMergedCarrierEntry.getLevel()).thenReturn(WIFI_LEVEL_UNREACHABLE);
- assertThat(mInternetDialogController.getCarrierNetworkLevel()).isEqualTo(WIFI_LEVEL_MIN);
+ assertThat(mInternetDetailsContentController.getCarrierNetworkLevel()).isEqualTo(
+ WIFI_LEVEL_MIN);
}
@Test
@@ -1048,7 +1056,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
for (int level = WIFI_LEVEL_MIN; level <= WIFI_LEVEL_MAX; level++) {
when(mMergedCarrierEntry.getLevel()).thenReturn(level);
- assertThat(mInternetDialogController.getCarrierNetworkLevel()).isEqualTo(level);
+ assertThat(mInternetDetailsContentController.getCarrierNetworkLevel()).isEqualTo(level);
}
}
@@ -1057,7 +1065,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
Resources res = mock(Resources.class);
doReturn("Carrier network changing").when(res).getString(anyInt());
when(SubscriptionManager.getResourcesForSubId(any(), eq(SUB_ID))).thenReturn(res);
- InternetDialogController spyController = spy(mInternetDialogController);
+ InternetDetailsContentController spyController = spy(mInternetDetailsContentController);
Map<Integer, TelephonyDisplayInfo> mSubIdTelephonyDisplayInfoMap =
spyController.mSubIdTelephonyDisplayInfoMap;
TelephonyDisplayInfo info = new TelephonyDisplayInfo(TelephonyManager.NETWORK_TYPE_LTE,
@@ -1076,14 +1084,14 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
public void getConfiguratorQrCodeGeneratorIntentOrNull_wifiNotShareable_returnNull() {
mFlags.set(Flags.SHARE_WIFI_QS_BUTTON, true);
when(mConnectedEntry.canShare()).thenReturn(false);
- assertThat(mInternetDialogController.getConfiguratorQrCodeGeneratorIntentOrNull(
+ assertThat(mInternetDetailsContentController.getConfiguratorQrCodeGeneratorIntentOrNull(
mConnectedEntry)).isNull();
}
@Test
public void getConfiguratorQrCodeGeneratorIntentOrNull_flagOff_returnNull() {
mFlags.set(Flags.SHARE_WIFI_QS_BUTTON, false);
when(mConnectedEntry.canShare()).thenReturn(true);
- assertThat(mInternetDialogController.getConfiguratorQrCodeGeneratorIntentOrNull(
+ assertThat(mInternetDetailsContentController.getConfiguratorQrCodeGeneratorIntentOrNull(
mConnectedEntry)).isNull();
}
@@ -1092,7 +1100,7 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
mFlags.set(Flags.SHARE_WIFI_QS_BUTTON, true);
when(mConnectedEntry.canShare()).thenReturn(true);
when(mConnectedEntry.getWifiConfiguration()).thenReturn(null);
- assertThat(mInternetDialogController.getConfiguratorQrCodeGeneratorIntentOrNull(
+ assertThat(mInternetDetailsContentController.getConfiguratorQrCodeGeneratorIntentOrNull(
mConnectedEntry)).isNull();
}
@@ -1101,30 +1109,34 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
mFlags.set(Flags.SHARE_WIFI_QS_BUTTON, true);
when(mConnectedEntry.canShare()).thenReturn(true);
when(mConnectedEntry.getWifiConfiguration()).thenReturn(mWifiConfiguration);
- assertThat(mInternetDialogController.getConfiguratorQrCodeGeneratorIntentOrNull(
+ assertThat(mInternetDetailsContentController.getConfiguratorQrCodeGeneratorIntentOrNull(
mConnectedEntry)).isNotNull();
}
@Test
public void onStop_cleanUp() {
doReturn(SUB_ID).when(mTelephonyManager).getSubscriptionId();
- assertThat(mInternetDialogController.mSubIdTelephonyManagerMap.get(SUB_ID)).isEqualTo(
+ assertThat(
+ mInternetDetailsContentController.mSubIdTelephonyManagerMap.get(SUB_ID)).isEqualTo(
mTelephonyManager);
- assertThat(mInternetDialogController.mSubIdTelephonyCallbackMap.get(SUB_ID)).isNotNull();
- assertThat(mInternetDialogController.mCallback).isNotNull();
+ assertThat(mInternetDetailsContentController.mSubIdTelephonyCallbackMap.get(
+ SUB_ID)).isNotNull();
+ assertThat(mInternetDetailsContentController.mCallback).isNotNull();
- mInternetDialogController.onStop();
+ mInternetDetailsContentController.onStop();
verify(mTelephonyManager).unregisterTelephonyCallback(any(TelephonyCallback.class));
- assertThat(mInternetDialogController.mSubIdTelephonyDisplayInfoMap.isEmpty()).isTrue();
- assertThat(mInternetDialogController.mSubIdTelephonyManagerMap.isEmpty()).isTrue();
- assertThat(mInternetDialogController.mSubIdTelephonyCallbackMap.isEmpty()).isTrue();
- verify(mSubscriptionManager).removeOnSubscriptionsChangedListener(mInternetDialogController
- .mOnSubscriptionsChangedListener);
- verify(mAccessPointController).removeAccessPointCallback(mInternetDialogController);
+ assertThat(
+ mInternetDetailsContentController.mSubIdTelephonyDisplayInfoMap.isEmpty()).isTrue();
+ assertThat(mInternetDetailsContentController.mSubIdTelephonyManagerMap.isEmpty()).isTrue();
+ assertThat(mInternetDetailsContentController.mSubIdTelephonyCallbackMap.isEmpty()).isTrue();
+ verify(mSubscriptionManager).removeOnSubscriptionsChangedListener(
+ mInternetDetailsContentController
+ .mOnSubscriptionsChangedListener);
+ verify(mAccessPointController).removeAccessPointCallback(mInternetDetailsContentController);
verify(mConnectivityManager).unregisterNetworkCallback(
any(ConnectivityManager.NetworkCallback.class));
- assertThat(mInternetDialogController.mCallback).isNull();
+ assertThat(mInternetDetailsContentController.mCallback).isNull();
}
@Test
@@ -1132,16 +1144,16 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
when(SubscriptionManager.getDefaultDataSubscriptionId())
.thenReturn(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
- mInternetDialogController.mOnSubscriptionsChangedListener.onSubscriptionsChanged();
+ mInternetDetailsContentController.mOnSubscriptionsChangedListener.onSubscriptionsChanged();
- assertThat(mInternetDialogController.hasActiveSubIdOnDds()).isFalse();
+ assertThat(mInternetDetailsContentController.hasActiveSubIdOnDds()).isFalse();
}
@Test
public void hasActiveSubIdOnDds_activeDds_returnTrue() {
- mInternetDialogController.mOnSubscriptionsChangedListener.onSubscriptionsChanged();
+ mInternetDetailsContentController.mOnSubscriptionsChangedListener.onSubscriptionsChanged();
- assertThat(mInternetDialogController.hasActiveSubIdOnDds()).isTrue();
+ assertThat(mInternetDetailsContentController.hasActiveSubIdOnDds()).isTrue();
}
@Test
@@ -1153,9 +1165,9 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
when(info.getProfileClass()).thenReturn(PROFILE_CLASS_PROVISIONING);
when(mSubscriptionManager.getActiveSubscriptionInfo(SUB_ID)).thenReturn(info);
- mInternetDialogController.mOnSubscriptionsChangedListener.onSubscriptionsChanged();
+ mInternetDetailsContentController.mOnSubscriptionsChangedListener.onSubscriptionsChanged();
- assertThat(mInternetDialogController.hasActiveSubIdOnDds()).isFalse();
+ assertThat(mInternetDetailsContentController.hasActiveSubIdOnDds()).isFalse();
}
@Test
@@ -1167,9 +1179,9 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
when(info.isOnlyNonTerrestrialNetwork()).thenReturn(true);
when(mSubscriptionManager.getActiveSubscriptionInfo(SUB_ID)).thenReturn(info);
- mInternetDialogController.mOnSubscriptionsChangedListener.onSubscriptionsChanged();
+ mInternetDetailsContentController.mOnSubscriptionsChangedListener.onSubscriptionsChanged();
- assertFalse(mInternetDialogController.hasActiveSubIdOnDds());
+ assertFalse(mInternetDetailsContentController.hasActiveSubIdOnDds());
}
@Test
@@ -1181,9 +1193,9 @@ public class InternetDialogDelegateControllerTest extends SysuiTestCase {
when(info.isOnlyNonTerrestrialNetwork()).thenReturn(false);
when(mSubscriptionManager.getActiveSubscriptionInfo(SUB_ID)).thenReturn(info);
- mInternetDialogController.mOnSubscriptionsChangedListener.onSubscriptionsChanged();
+ mInternetDetailsContentController.mOnSubscriptionsChangedListener.onSubscriptionsChanged();
- assertTrue(mInternetDialogController.hasActiveSubIdOnDds());
+ assertTrue(mInternetDetailsContentController.hasActiveSubIdOnDds());
}
private String getResourcesString(String name) {
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateTest.java
index 8560b67dee33..a33bd98b6086 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateTest.java
@@ -1,6 +1,6 @@
package com.android.systemui.qs.tiles.dialog;
-import static com.android.systemui.qs.tiles.dialog.InternetDialogController.MAX_WIFI_ENTRY_COUNT;
+import static com.android.systemui.qs.tiles.dialog.InternetDetailsContentController.MAX_WIFI_ENTRY_COUNT;
import static com.google.common.truth.Truth.assertThat;
@@ -78,7 +78,7 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Mock
private InternetAdapter mInternetAdapter;
@Mock
- private InternetDialogController mInternetDialogController;
+ private InternetDetailsContentController mInternetDetailsContentController;
@Mock
private KeyguardStateController mKeyguard;
@Mock
@@ -118,12 +118,12 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
when(mInternetWifiEntry.hasInternetAccess()).thenReturn(true);
when(mWifiEntries.size()).thenReturn(1);
- when(mInternetDialogController.getMobileNetworkTitle(anyInt()))
+ when(mInternetDetailsContentController.getMobileNetworkTitle(anyInt()))
.thenReturn(MOBILE_NETWORK_TITLE);
- when(mInternetDialogController.getMobileNetworkSummary(anyInt()))
+ when(mInternetDetailsContentController.getMobileNetworkSummary(anyInt()))
.thenReturn(MOBILE_NETWORK_SUMMARY);
- when(mInternetDialogController.isWifiEnabled()).thenReturn(true);
- when(mInternetDialogController.getActiveAutoSwitchNonDdsSubId()).thenReturn(
+ when(mInternetDetailsContentController.isWifiEnabled()).thenReturn(true);
+ when(mInternetDetailsContentController.getActiveAutoSwitchNonDdsSubId()).thenReturn(
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
mMockitoSession = ExtendedMockito.mockitoSession()
.spyStatic(WifiEnterpriseRestrictionUtils.class)
@@ -140,7 +140,7 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
mInternetDialogDelegate = new InternetDialogDelegate(
mContext,
mock(InternetDialogManager.class),
- mInternetDialogController,
+ mInternetDetailsContentController,
true,
true,
true,
@@ -200,7 +200,7 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_withApmOn_internetDialogSubTitleGone() {
- when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true);
+ when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(true);
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -212,7 +212,7 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_withApmOff_internetDialogSubTitleVisible() {
- when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(false);
+ when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(false);
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -224,8 +224,8 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_apmOffAndHasEthernet_showEthernet() {
- when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(false);
- when(mInternetDialogController.hasEthernet()).thenReturn(true);
+ when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(false);
+ when(mInternetDetailsContentController.hasEthernet()).thenReturn(true);
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -237,8 +237,8 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_apmOffAndNoEthernet_hideEthernet() {
- when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(false);
- when(mInternetDialogController.hasEthernet()).thenReturn(false);
+ when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(false);
+ when(mInternetDetailsContentController.hasEthernet()).thenReturn(false);
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -250,8 +250,8 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_apmOnAndHasEthernet_showEthernet() {
- when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true);
- when(mInternetDialogController.hasEthernet()).thenReturn(true);
+ when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(true);
+ when(mInternetDetailsContentController.hasEthernet()).thenReturn(true);
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -263,8 +263,8 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_apmOnAndNoEthernet_hideEthernet() {
- when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true);
- when(mInternetDialogController.hasEthernet()).thenReturn(false);
+ when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(true);
+ when(mInternetDetailsContentController.hasEthernet()).thenReturn(false);
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -277,9 +277,9 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_apmOffAndNotCarrierNetwork_mobileDataLayoutGone() {
// Mobile network should be gone if the list of active subscriptionId is null.
- when(mInternetDialogController.isCarrierNetworkActive()).thenReturn(false);
- when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(false);
- when(mInternetDialogController.hasActiveSubIdOnDds()).thenReturn(false);
+ when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(false);
+ when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(false);
+ when(mInternetDetailsContentController.hasActiveSubIdOnDds()).thenReturn(false);
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -292,9 +292,9 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_apmOnWithCarrierNetworkAndWifiStatus_mobileDataLayoutVisible() {
// Carrier network should be visible if airplane mode ON and Wi-Fi is ON.
- when(mInternetDialogController.isCarrierNetworkActive()).thenReturn(true);
- when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true);
- when(mInternetDialogController.isWifiEnabled()).thenReturn(true);
+ when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(true);
+ when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(true);
+ when(mInternetDetailsContentController.isWifiEnabled()).thenReturn(true);
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -307,9 +307,9 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_apmOnWithCarrierNetworkAndWifiStatus_mobileDataLayoutGone() {
// Carrier network should be gone if airplane mode ON and Wi-Fi is off.
- when(mInternetDialogController.isCarrierNetworkActive()).thenReturn(true);
- when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true);
- when(mInternetDialogController.isWifiEnabled()).thenReturn(false);
+ when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(true);
+ when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(true);
+ when(mInternetDetailsContentController.isWifiEnabled()).thenReturn(false);
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -321,8 +321,8 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_apmOnAndNoCarrierNetwork_mobileDataLayoutGone() {
- when(mInternetDialogController.isCarrierNetworkActive()).thenReturn(false);
- when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true);
+ when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(false);
+ when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(true);
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -334,10 +334,10 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_apmOnAndWifiOnHasCarrierNetwork_showAirplaneSummary() {
- when(mInternetDialogController.isCarrierNetworkActive()).thenReturn(true);
- when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true);
+ when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(true);
+ when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(true);
mInternetDialogDelegate.mConnectedWifiEntry = null;
- doReturn(false).when(mInternetDialogController).activeNetworkIsCellular();
+ doReturn(false).when(mInternetDetailsContentController).activeNetworkIsCellular();
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -350,10 +350,10 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_apmOffAndWifiOnHasCarrierNetwork_notShowApmSummary() {
- when(mInternetDialogController.isCarrierNetworkActive()).thenReturn(true);
- when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(false);
+ when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(true);
+ when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(false);
mInternetDialogDelegate.mConnectedWifiEntry = null;
- doReturn(false).when(mInternetDialogController).activeNetworkIsCellular();
+ doReturn(false).when(mInternetDetailsContentController).activeNetworkIsCellular();
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -365,8 +365,8 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_apmOffAndHasCarrierNetwork_notShowApmSummary() {
- when(mInternetDialogController.isCarrierNetworkActive()).thenReturn(true);
- when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(false);
+ when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(true);
+ when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(false);
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -378,8 +378,8 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_apmOnAndNoCarrierNetwork_notShowApmSummary() {
- when(mInternetDialogController.isCarrierNetworkActive()).thenReturn(false);
- when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true);
+ when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(false);
+ when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(true);
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -391,9 +391,9 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_mobileDataIsEnabled_checkMobileDataSwitch() {
- doReturn(true).when(mInternetDialogController).hasActiveSubIdOnDds();
- when(mInternetDialogController.isCarrierNetworkActive()).thenReturn(true);
- when(mInternetDialogController.isMobileDataEnabled()).thenReturn(true);
+ doReturn(true).when(mInternetDetailsContentController).hasActiveSubIdOnDds();
+ when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(true);
+ when(mInternetDetailsContentController.isMobileDataEnabled()).thenReturn(true);
mMobileToggleSwitch.setChecked(false);
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -406,9 +406,9 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_mobileDataIsNotChanged_checkMobileDataSwitch() {
- doReturn(true).when(mInternetDialogController).hasActiveSubIdOnDds();
- when(mInternetDialogController.isCarrierNetworkActive()).thenReturn(true);
- when(mInternetDialogController.isMobileDataEnabled()).thenReturn(false);
+ doReturn(true).when(mInternetDetailsContentController).hasActiveSubIdOnDds();
+ when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(true);
+ when(mInternetDetailsContentController.isMobileDataEnabled()).thenReturn(false);
mMobileToggleSwitch.setChecked(false);
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -421,10 +421,10 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_wifiOnAndHasInternetWifi_showConnectedWifi() {
- when(mInternetDialogController.getActiveAutoSwitchNonDdsSubId()).thenReturn(1);
- doReturn(true).when(mInternetDialogController).hasActiveSubIdOnDds();
+ when(mInternetDetailsContentController.getActiveAutoSwitchNonDdsSubId()).thenReturn(1);
+ doReturn(true).when(mInternetDetailsContentController).hasActiveSubIdOnDds();
// The preconditions WiFi ON and Internet WiFi are already in setUp()
- doReturn(false).when(mInternetDialogController).activeNetworkIsCellular();
+ doReturn(false).when(mInternetDetailsContentController).activeNetworkIsCellular();
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -442,7 +442,7 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
public void updateDialog_wifiOnAndNoConnectedWifi_hideConnectedWifi() {
// The precondition WiFi ON is already in setUp()
mInternetDialogDelegate.mConnectedWifiEntry = null;
- doReturn(false).when(mInternetDialogController).activeNetworkIsCellular();
+ doReturn(false).when(mInternetDetailsContentController).activeNetworkIsCellular();
mInternetDialogDelegate.updateDialog(false);
mBgExecutor.runAllReady();
@@ -543,7 +543,7 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_deviceLockedAndNoConnectedWifi_showWifiToggle() {
// The preconditions WiFi entries are already in setUp()
- when(mInternetDialogController.isDeviceLocked()).thenReturn(true);
+ when(mInternetDetailsContentController.isDeviceLocked()).thenReturn(true);
mInternetDialogDelegate.mConnectedWifiEntry = null;
mInternetDialogDelegate.updateDialog(false);
mBgExecutor.runAllReady();
@@ -563,7 +563,7 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_deviceLockedAndHasConnectedWifi_showWifiToggleWithBackground() {
// The preconditions WiFi ON and WiFi entries are already in setUp()
- when(mInternetDialogController.isDeviceLocked()).thenReturn(true);
+ when(mInternetDetailsContentController.isDeviceLocked()).thenReturn(true);
mInternetDialogDelegate.updateDialog(false);
mBgExecutor.runAllReady();
@@ -614,11 +614,11 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_showSecondaryDataSub() {
- when(mInternetDialogController.getActiveAutoSwitchNonDdsSubId()).thenReturn(1);
- doReturn(1).when(mInternetDialogController).getActiveAutoSwitchNonDdsSubId();
- doReturn(true).when(mInternetDialogController).hasActiveSubIdOnDds();
- doReturn(false).when(mInternetDialogController).isAirplaneModeEnabled();
- clearInvocations(mInternetDialogController);
+ when(mInternetDetailsContentController.getActiveAutoSwitchNonDdsSubId()).thenReturn(1);
+ doReturn(1).when(mInternetDetailsContentController).getActiveAutoSwitchNonDdsSubId();
+ doReturn(true).when(mInternetDetailsContentController).hasActiveSubIdOnDds();
+ doReturn(false).when(mInternetDetailsContentController).isAirplaneModeEnabled();
+ clearInvocations(mInternetDetailsContentController);
mInternetDialogDelegate.updateDialog(true);
mBgExecutor.runAllReady();
@@ -629,7 +629,7 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
LinearLayout secondaryLayout = mDialogView.requireViewById(
R.id.secondary_mobile_network_layout);
- verify(mInternetDialogController).getMobileNetworkSummary(1);
+ verify(mInternetDetailsContentController).getMobileNetworkSummary(1);
assertThat(primaryLayout.getBackground()).isNotEqualTo(
secondaryLayout.getBackground());
});
@@ -652,8 +652,8 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_wifiOffAndWifiScanOff_hideWifiScanNotify() {
- when(mInternetDialogController.isWifiEnabled()).thenReturn(false);
- when(mInternetDialogController.isWifiScanEnabled()).thenReturn(false);
+ when(mInternetDetailsContentController.isWifiEnabled()).thenReturn(false);
+ when(mInternetDetailsContentController.isWifiScanEnabled()).thenReturn(false);
mInternetDialogDelegate.updateDialog(false);
mBgExecutor.runAllReady();
@@ -667,9 +667,9 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_wifiOffAndWifiScanOnAndDeviceLocked_hideWifiScanNotify() {
- when(mInternetDialogController.isWifiEnabled()).thenReturn(false);
- when(mInternetDialogController.isWifiScanEnabled()).thenReturn(true);
- when(mInternetDialogController.isDeviceLocked()).thenReturn(true);
+ when(mInternetDetailsContentController.isWifiEnabled()).thenReturn(false);
+ when(mInternetDetailsContentController.isWifiScanEnabled()).thenReturn(true);
+ when(mInternetDetailsContentController.isDeviceLocked()).thenReturn(true);
mInternetDialogDelegate.updateDialog(false);
mBgExecutor.runAllReady();
@@ -683,9 +683,9 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_wifiOffAndWifiScanOnAndDeviceUnlocked_showWifiScanNotify() {
- when(mInternetDialogController.isWifiEnabled()).thenReturn(false);
- when(mInternetDialogController.isWifiScanEnabled()).thenReturn(true);
- when(mInternetDialogController.isDeviceLocked()).thenReturn(false);
+ when(mInternetDetailsContentController.isWifiEnabled()).thenReturn(false);
+ when(mInternetDetailsContentController.isWifiScanEnabled()).thenReturn(true);
+ when(mInternetDetailsContentController.isDeviceLocked()).thenReturn(false);
mInternetDialogDelegate.updateDialog(false);
mBgExecutor.runAllReady();
@@ -701,7 +701,7 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_wifiIsDisabled_uncheckWifiSwitch() {
- when(mInternetDialogController.isWifiEnabled()).thenReturn(false);
+ when(mInternetDetailsContentController.isWifiEnabled()).thenReturn(false);
mWifiToggleSwitch.setChecked(true);
mInternetDialogDelegate.updateDialog(false);
mBgExecutor.runAllReady();
@@ -714,7 +714,7 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_wifiIsEnabled_checkWifiSwitch() throws Exception {
- when(mInternetDialogController.isWifiEnabled()).thenReturn(true);
+ when(mInternetDetailsContentController.isWifiEnabled()).thenReturn(true);
mWifiToggleSwitch.setChecked(false);
mInternetDialogDelegate.updateDialog(false);
mBgExecutor.runAllReady();
@@ -729,7 +729,7 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
public void onClickSeeMoreButton_clickSeeAll_verifyLaunchNetworkSetting() {
mSeeAll.performClick();
- verify(mInternetDialogController).launchNetworkSetting(
+ verify(mInternetDetailsContentController).launchNetworkSetting(
mDialogView.requireViewById(R.id.see_all_layout));
}
@@ -802,7 +802,7 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_shareWifiIntentNull_hideButton() {
- when(mInternetDialogController.getConfiguratorQrCodeGeneratorIntentOrNull(any()))
+ when(mInternetDetailsContentController.getConfiguratorQrCodeGeneratorIntentOrNull(any()))
.thenReturn(null);
mInternetDialogDelegate.updateDialog(false);
mBgExecutor.runAllReady();
@@ -816,7 +816,7 @@ public class InternetDialogDelegateTest extends SysuiTestCase {
@Test
public void updateDialog_shareWifiShareable_showButton() {
- when(mInternetDialogController.getConfiguratorQrCodeGeneratorIntentOrNull(any()))
+ when(mInternetDetailsContentController.getConfiguratorQrCodeGeneratorIntentOrNull(any()))
.thenReturn(new Intent());
mInternetDialogDelegate.updateDialog(false);
mBgExecutor.runAllReady();
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-11-01 19:16:33 +0000