Merge "[QSDetailedView] Rename InternetDialogController to... (4d6a407f) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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",

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/dialog/InternetAdapterTest.java

+8 −8

Original line number	Diff line number	Diff line
		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

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetAdapter.java

+18 −14

Original line number	Diff line number	Diff line
		@@ -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;
		}

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java→packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentController.java

+10 −8

Original line number	Diff line number	Diff line
		@@ -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);

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegate.java

+52 −46

File changed.

Preview size limit exceeded, changes collapsed.