From c9d58c10d600bb368fc869baa22321bf9cab074a Mon Sep 17 00:00:00 2001 From: Weng Su Date: Fri, 13 Aug 2021 17:05:17 +0800 Subject: [PATCH 1/4] [RESTRICT AUTOMERGE] [Provider Model] Correct Wi-Fi toggle title color in Dark Theme - Update title color when device is locked in Dark Theme Bug: 196513308 Test: manual test atest -c InternetDialogTest Change-Id: I24e86a75d4a72c837191277ed5258b81cd5aee00 (cherry picked from commit 45de39e0b085c73abb1e47da83521de7aad5ef7d) --- .../SystemUI/res/layout/internet_connectivity_dialog.xml | 1 + .../android/systemui/qs/tiles/dialog/InternetDialog.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml index 5b58fe8c0b582..3aa2e5aca2a79 100644 --- a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml +++ b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml @@ -191,6 +191,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent"> Date: Tue, 10 Aug 2021 23:27:11 +0800 Subject: [PATCH 2/4] [RESTRICT AUTOMERGE] [Provider Model] Enforce DISALLOW_CONFIG_WIFI in Internet Panel - Avoid the appearance of WiFi-related strings in sub-title - Hide all of Wi-Fi related views - Do not scan Wi-Fi result Bug: 195669955 Test: manual test atest -c InternetDialogControllerTest \ InternetDialogTest Change-Id: I5c19e6a8e52d2c9207053ffb7539d931d1f04799 (cherry picked from commit 018c97979c55fe355cfe6148712f7d53e744114b) --- .../systemui/qs/tiles/InternetTile.java | 5 +- .../qs/tiles/dialog/InternetDialog.java | 31 +++++-- .../dialog/InternetDialogController.java | 48 ++++------ .../qs/tiles/dialog/InternetDialogFactory.kt | 12 +-- .../policy/NetworkControllerImpl.java | 4 +- .../dialog/InternetDialogControllerTest.java | 88 ++++++++++--------- .../qs/tiles/dialog/InternetDialogTest.java | 49 +++++++---- 7 files changed, 130 insertions(+), 107 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java index d0a4b62b8a1b0..cc9e7485dcffa 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java @@ -122,8 +122,9 @@ public class InternetTile extends QSTileImpl { @Override protected void handleClick(@Nullable View view) { - boolean canConfigMobileData = mAccessPointController.canConfigMobileData(); - mHandler.post(() -> mInternetDialogFactory.create(true, canConfigMobileData)); + mHandler.post(() -> mInternetDialogFactory.create(true, + mAccessPointController.canConfigMobileData(), + mAccessPointController.canConfigWifi())); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java index 8a3f983ad3f90..7d3734e85dbef 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java @@ -51,7 +51,6 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ProgressBar; -import android.widget.Space; import android.widget.Switch; import android.widget.TextView; @@ -93,6 +92,8 @@ public class InternetDialog extends SystemUIDialog implements protected View mDialogView; @VisibleForTesting protected WifiEntry mConnectedWifiEntry; + @VisibleForTesting + protected boolean mCanConfigWifi; private InternetDialogFactory mInternetDialogFactory; private SubscriptionManager mSubscriptionManager; @@ -152,7 +153,8 @@ public class InternetDialog extends SystemUIDialog implements public InternetDialog(Context context, InternetDialogFactory internetDialogFactory, InternetDialogController internetDialogController, boolean canConfigMobileData, - boolean aboveStatusBar, UiEventLogger uiEventLogger, @Main Handler handler) { + boolean canConfigWifi, boolean aboveStatusBar, UiEventLogger uiEventLogger, + @Main Handler handler) { super(context, R.style.Theme_SystemUI_Dialog_Internet); if (DEBUG) { Log.d(TAG, "Init InternetDialog"); @@ -166,6 +168,7 @@ public class InternetDialog extends SystemUIDialog implements mTelephonyManager = mInternetDialogController.getTelephonyManager(); mWifiManager = mInternetDialogController.getWifiManager(); mCanConfigMobileData = canConfigMobileData; + mCanConfigWifi = canConfigWifi; mLayoutManager = new LinearLayoutManager(mContext) { @Override @@ -249,7 +252,19 @@ public class InternetDialog extends SystemUIDialog implements if (DEBUG) { Log.d(TAG, "onStart"); } - mInternetDialogController.onStart(this); + mInternetDialogController.onStart(this, mCanConfigWifi); + if (!mCanConfigWifi) { + hideWifiViews(); + } + } + + @VisibleForTesting + void hideWifiViews() { + setProgressBarVisible(false); + mTurnWifiOnLayout.setVisibility(View.GONE); + mConnectedWifListLayout.setVisibility(View.GONE); + mWifiRecyclerView.setVisibility(View.GONE); + mSeeAllLayout.setVisibility(View.GONE); } @Override @@ -288,9 +303,13 @@ public class InternetDialog extends SystemUIDialog implements } else { mInternetDialogSubTitle.setText(getSubtitleText()); } - showProgressBar(); setMobileDataLayout(mInternetDialogController.activeNetworkIsCellular()); + if (!mCanConfigWifi) { + return; + } + + showProgressBar(); final boolean isDeviceLocked = mInternetDialogController.isDeviceLocked(); final boolean isWifiEnabled = mWifiManager.isWifiEnabled(); updateWifiToggle(isWifiEnabled, isDeviceLocked); @@ -387,8 +406,8 @@ public class InternetDialog extends SystemUIDialog implements return; } mConnectedWifListLayout.setVisibility(View.VISIBLE); - mConnectedWifiTitleText.setText(mInternetDialogController.getInternetWifiTitle()); - mConnectedWifiSummaryText.setText(mInternetDialogController.getInternetWifiSummary()); + mConnectedWifiTitleText.setText(mConnectedWifiEntry.getTitle()); + mConnectedWifiSummaryText.setText(mConnectedWifiEntry.getSummary(false)); mConnectedWifiIcon.setImageDrawable( mInternetDialogController.getInternetWifiDrawable(mConnectedWifiEntry)); if (mInternetDialogController.isNightMode()) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java index ed32730c58b1b..8838e6bda6fde 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java @@ -139,6 +139,8 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, protected InternetTelephonyCallback mInternetTelephonyCallback; @VisibleForTesting protected WifiUtils.InternetIconInjector mWifiIconInjector; + @VisibleForTesting + protected boolean mCanConfigWifi; @VisibleForTesting KeyguardStateController mKeyguardStateController; @@ -193,7 +195,7 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, mWifiIconInjector = new WifiUtils.InternetIconInjector(mContext); } - void onStart(@NonNull InternetDialogCallback callback) { + void onStart(@NonNull InternetDialogCallback callback, boolean canConfigWifi) { if (DEBUG) { Log.d(TAG, "onStart"); } @@ -217,6 +219,7 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, mConnectivityManager.registerNetworkCallback(new NetworkRequest.Builder() .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) .build(), new DataConnectivityListener(), mHandler); + mCanConfigWifi = canConfigWifi; scanWifiAccessPoints(); } @@ -270,7 +273,7 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, return null; } - if (!mWifiManager.isWifiEnabled()) { + if (mCanConfigWifi && !mWifiManager.isWifiEnabled()) { // When the airplane mode is off and Wi-Fi is disabled. // Sub-Title: Wi-Fi is off if (DEBUG) { @@ -290,10 +293,10 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, final List wifiList = mWifiManager.getScanResults(); if (wifiList != null && wifiList.size() != 0) { - return mContext.getText(SUBTITLE_TEXT_TAP_A_NETWORK_TO_CONNECT); + return mCanConfigWifi ? mContext.getText(SUBTITLE_TEXT_TAP_A_NETWORK_TO_CONNECT) : null; } - if (isProgressBarVisible) { + if (mCanConfigWifi && isProgressBarVisible) { // When the Wi-Fi scan result callback is received // Sub-Title: Searching for networks... return mContext.getText(SUBTITLE_TEXT_SEARCHING_FOR_NETWORKS); @@ -317,7 +320,7 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, return mContext.getText(SUBTITLE_TEXT_ALL_CARRIER_NETWORK_UNAVAILABLE); } - if (!isMobileDataEnabled()) { + if (mCanConfigWifi && !isMobileDataEnabled()) { if (DEBUG) { Log.d(TAG, "Mobile data off"); } @@ -331,7 +334,10 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, return mContext.getText(SUBTITLE_TEXT_ALL_CARRIER_NETWORK_UNAVAILABLE); } - return mContext.getText(SUBTITLE_TEXT_NON_CARRIER_NETWORK_UNAVAILABLE); + if (mCanConfigWifi) { + return mContext.getText(SUBTITLE_TEXT_NON_CARRIER_NETWORK_UNAVAILABLE); + } + return null; } Drawable getInternetWifiDrawable(@NonNull WifiEntry wifiEntry) { @@ -549,26 +555,6 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, return summary; } - String getInternetWifiTitle() { - if (getInternetWifiEntry() == null) { - if (DEBUG) { - Log.d(TAG, "connected entry is null"); - } - return ""; - } - return getInternetWifiEntry().getTitle(); - } - - String getInternetWifiSummary() { - if (getInternetWifiEntry() == null) { - if (DEBUG) { - Log.d(TAG, "connected entry is null"); - } - return ""; - } - return getInternetWifiEntry().getSummary(false); - } - void launchNetworkSetting() { mCallback.dismissDialog(); mActivityStarter.postStartActivityDismissingKeyguard(getSettingsIntent(), 0); @@ -780,12 +766,14 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, } void scanWifiAccessPoints() { - mAccessPointController.scanForAccessPoints(); + if (mCanConfigWifi) { + mAccessPointController.scanForAccessPoints(); + } } @Override public void onAccessPointsChanged(List accessPoints) { - if (accessPoints == null) { + if (accessPoints == null || !mCanConfigWifi) { return; } @@ -869,8 +857,8 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, @Override public void onReceive(Context context, Intent intent) { final String action = intent.getAction(); - if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION) - || action.equals(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)) { + if (mCanConfigWifi && (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION) + || action.equals(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION))) { mCallback.onWifiStateReceived(context, intent); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogFactory.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogFactory.kt index e82e89ef14c44..11c6980678b1c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogFactory.kt @@ -31,17 +31,17 @@ private val DEBUG = Log.isLoggable(TAG, Log.DEBUG) */ @SysUISingleton class InternetDialogFactory @Inject constructor( - @Main private val handler: Handler, - private val internetDialogController: InternetDialogController, - private val context: Context, - private val uiEventLogger: UiEventLogger + @Main private val handler: Handler, + private val internetDialogController: InternetDialogController, + private val context: Context, + private val uiEventLogger: UiEventLogger ) { companion object { var internetDialog: InternetDialog? = null } /** Creates a [InternetDialog]. */ - fun create(aboveStatusBar: Boolean, canConfigMobileData: Boolean) { + fun create(aboveStatusBar: Boolean, canConfigMobileData: Boolean, canConfigWifi: Boolean) { if (internetDialog != null) { if (DEBUG) { Log.d(TAG, "InternetDialog is showing, do not create it twice.") @@ -49,7 +49,7 @@ class InternetDialogFactory @Inject constructor( return } else { internetDialog = InternetDialog(context, this, internetDialogController, - canConfigMobileData, aboveStatusBar, uiEventLogger, handler) + canConfigMobileData, canConfigWifi, aboveStatusBar, uiEventLogger, handler) internetDialog?.show() } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index c3f8853aaf140..9327391bea8ad 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -793,8 +793,8 @@ public class NetworkControllerImpl extends BroadcastReceiver mReceiverHandler.post(this::handleConfigurationChanged); break; case Settings.Panel.ACTION_INTERNET_CONNECTIVITY: - boolean canConfigMobileData = mAccessPoints.canConfigMobileData(); - mMainHandler.post(() -> mInternetDialogFactory.create(true, canConfigMobileData)); + mMainHandler.post(() -> mInternetDialogFactory.create(true, + mAccessPoints.canConfigMobileData(), mAccessPoints.canConfigWifi())); break; default: int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java index 830fe5af69b8c..a57d439672e93 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java @@ -10,6 +10,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -100,6 +101,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { when(mKeyguardStateController.isUnlocked()).thenReturn(true); when(mConnectedEntry.isDefaultNetwork()).thenReturn(true); when(mConnectedEntry.hasInternetAccess()).thenReturn(true); + when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[]{SUB_ID}); mInternetDialogController = new MockInternetDialogController(mContext, mock(UiEventLogger.class), mock(ActivityStarter.class), mAccessPointController, @@ -109,7 +111,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { mSubscriptionManager.addOnSubscriptionsChangedListener(mExecutor, mInternetDialogController.mOnSubscriptionsChangedListener); mInternetDialogController.onStart( - mock(InternetDialogController.InternetDialogCallback.class)); + mock(InternetDialogController.InternetDialogCallback.class), true); mInternetDialogController.mActivityStarter = mActivityStarter; mInternetDialogController.mConnectedEntry = mConnectedEntry; mInternetDialogController.mWifiIconInjector = mWifiIconInjector; @@ -143,8 +145,14 @@ public class InternetDialogControllerTest extends SysuiTestCase { mInternetDialogController.setAirplaneModeEnabled(false); when(mWifiManager.isWifiEnabled()).thenReturn(false); - assertTrue(TextUtils.equals(mInternetDialogController.getSubtitleText(false), - getResourcesString("wifi_is_off"))); + assertThat(mInternetDialogController.getSubtitleText(false)) + .isEqualTo(getResourcesString("wifi_is_off")); + + // if the Wi-Fi disallow config, then don't return Wi-Fi related string. + mInternetDialogController.mCanConfigWifi = false; + + assertThat(mInternetDialogController.getSubtitleText(false)) + .isNotEqualTo(getResourcesString("wifi_is_off")); } @Test @@ -155,8 +163,14 @@ public class InternetDialogControllerTest extends SysuiTestCase { doReturn(0).when(wifiScanResults).size(); when(mWifiManager.getScanResults()).thenReturn(wifiScanResults); - assertTrue(TextUtils.equals(mInternetDialogController.getSubtitleText(true), - getResourcesString("wifi_empty_list_wifi_on"))); + assertThat(mInternetDialogController.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; + + assertThat(mInternetDialogController.getSubtitleText(true)) + .isNotEqualTo(getResourcesString("wifi_empty_list_wifi_on")); } @Test @@ -167,8 +181,14 @@ public class InternetDialogControllerTest extends SysuiTestCase { doReturn(1).when(wifiScanResults).size(); when(mWifiManager.getScanResults()).thenReturn(wifiScanResults); - assertTrue(TextUtils.equals(mInternetDialogController.getSubtitleText(false), - getResourcesString("tap_a_network_to_connect"))); + assertThat(mInternetDialogController.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; + + assertThat(mInternetDialogController.getSubtitleText(false)) + .isNotEqualTo(getResourcesString("tap_a_network_to_connect")); } @Test @@ -188,8 +208,6 @@ public class InternetDialogControllerTest extends SysuiTestCase { List wifiScanResults = new ArrayList<>(); doReturn(wifiScanResults).when(mWifiManager).getScanResults(); when(mWifiManager.getScanResults()).thenReturn(wifiScanResults); - when(mSubscriptionManager.getActiveSubscriptionIdList()) - .thenReturn(new int[] {SUB_ID}); doReturn(ServiceState.STATE_OUT_OF_SERVICE).when(mServiceState).getState(); doReturn(mServiceState).when(mTelephonyManager).getServiceState(); @@ -206,16 +224,20 @@ public class InternetDialogControllerTest extends SysuiTestCase { List wifiScanResults = new ArrayList<>(); doReturn(wifiScanResults).when(mWifiManager).getScanResults(); when(mWifiManager.getScanResults()).thenReturn(wifiScanResults); - when(mSubscriptionManager.getActiveSubscriptionIdList()) - .thenReturn(new int[] {SUB_ID}); doReturn(ServiceState.STATE_IN_SERVICE).when(mServiceState).getState(); doReturn(mServiceState).when(mTelephonyManager).getServiceState(); when(mTelephonyManager.isDataEnabled()).thenReturn(false); - assertTrue(TextUtils.equals(mInternetDialogController.getSubtitleText(false), - getResourcesString("non_carrier_network_unavailable"))); + assertThat(mInternetDialogController.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; + + assertThat(mInternetDialogController.getSubtitleText(false)) + .isNotEqualTo(getResourcesString("non_carrier_network_unavailable")); } @Test @@ -247,36 +269,6 @@ public class InternetDialogControllerTest extends SysuiTestCase { assertThat(mInternetDialogController.getInternetWifiEntry()).isEqualTo(mConnectedEntry); } - @Test - public void getInternetWifiTitle_withNoConnectedWifiEntry_returnEmpty() { - mInternetDialogController.mConnectedEntry = null; - - assertThat(mInternetDialogController.getInternetWifiTitle()).isEmpty(); - } - - @Test - public void getInternetWifiTitle_withInternetWifi_returnTitle() { - // The preconditions have been set in setUp(). - // - The connected Wi-Fi entry have both default network and internet access conditions. - when(mConnectedEntry.getTitle()).thenReturn(CONNECTED_TITLE); - - assertThat(mInternetDialogController.getInternetWifiTitle()).isEqualTo(CONNECTED_TITLE); - } - - @Test - public void getInternetWifiSummary_withNoConnectedWifiEntry_returnEmpty() { - mInternetDialogController.mConnectedEntry = null; - - assertThat(mInternetDialogController.getInternetWifiSummary()).isEmpty(); - } - - @Test - public void getInternetWifiSummary_withInternetWifi_returnSummary() { - when(mConnectedEntry.getSummary(false)).thenReturn(CONNECTED_SUMMARY); - - assertThat(mInternetDialogController.getInternetWifiSummary()).isEqualTo(CONNECTED_SUMMARY); - } - @Test public void getWifiDetailsSettingsIntent_withNoConnectedEntry_returnNull() { mInternetDialogController.mConnectedEntry = null; @@ -342,6 +334,16 @@ public class InternetDialogControllerTest extends SysuiTestCase { assertThat(mInternetDialogController.isDeviceLocked()).isTrue(); } + @Test + public void scanWifiAccessPoints_cannotConfigWifi_doNothing() { + reset(mAccessPointController); + mInternetDialogController.mCanConfigWifi = false; + + mInternetDialogController.scanWifiAccessPoints(); + + verify(mAccessPointController, never()).scanForAccessPoints(); + } + private String getResourcesString(String name) { return mContext.getResources().getString(getResourcesId(name)); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java index 5a018f409a0be..87e81e40a043d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java @@ -20,7 +20,6 @@ import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.view.View; import android.widget.LinearLayout; -import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; import androidx.test.filters.SmallTest; @@ -69,6 +68,9 @@ public class InternetDialogTest extends SysuiTestCase { private InternetDialogController mInternetDialogController; private InternetDialog mInternetDialog; + private View mDialogView; + private View mSubTitle; + private LinearLayout mMobileDataToggle; private LinearLayout mWifiToggle; private LinearLayout mConnectedWifi; private RecyclerView mWifiList; @@ -94,15 +96,18 @@ public class InternetDialogTest extends SysuiTestCase { when(mInternetDialogController.getWifiEntryList()).thenReturn(Arrays.asList(mWifiEntry)); mInternetDialog = new InternetDialog(mContext, mock(InternetDialogFactory.class), - mInternetDialogController, true, true, mock(UiEventLogger.class), mHandler); + mInternetDialogController, true, true, true, mock(UiEventLogger.class), mHandler); mInternetDialog.mAdapter = mInternetAdapter; mInternetDialog.mConnectedWifiEntry = mInternetWifiEntry; mInternetDialog.show(); - mWifiToggle = mInternetDialog.mDialogView.requireViewById(R.id.turn_on_wifi_layout); - mConnectedWifi = mInternetDialog.mDialogView.requireViewById(R.id.wifi_connected_layout); - mWifiList = mInternetDialog.mDialogView.requireViewById(R.id.wifi_list_layout); - mSeeAll = mInternetDialog.mDialogView.requireViewById(R.id.see_all_layout); + mDialogView = mInternetDialog.mDialogView; + mSubTitle = mDialogView.requireViewById(R.id.internet_dialog_subtitle); + mMobileDataToggle = mDialogView.requireViewById(R.id.mobile_network_layout); + mWifiToggle = mDialogView.requireViewById(R.id.turn_on_wifi_layout); + mConnectedWifi = mDialogView.requireViewById(R.id.wifi_connected_layout); + mWifiList = mDialogView.requireViewById(R.id.wifi_list_layout); + mSeeAll = mDialogView.requireViewById(R.id.see_all_layout); } @After @@ -110,34 +115,42 @@ public class InternetDialogTest extends SysuiTestCase { mInternetDialog.dismissDialog(); } + @Test + public void hideWifiViews_WifiViewsGone() { + mInternetDialog.hideWifiViews(); + + assertThat(mInternetDialog.mIsProgressBarVisible).isFalse(); + assertThat(mWifiToggle.getVisibility()).isEqualTo(View.GONE); + assertThat(mConnectedWifi.getVisibility()).isEqualTo(View.GONE); + assertThat(mWifiList.getVisibility()).isEqualTo(View.GONE); + assertThat(mSeeAll.getVisibility()).isEqualTo(View.GONE); + } + @Test public void updateDialog_withApmOn_internetDialogSubTitleGone() { when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true); - mInternetDialog.updateDialog(); - final TextView view = mInternetDialog.mDialogView.requireViewById( - R.id.internet_dialog_subtitle); - assertThat(view.getVisibility()).isEqualTo(View.GONE); + mInternetDialog.updateDialog(); + + assertThat(mSubTitle.getVisibility()).isEqualTo(View.GONE); } @Test public void updateDialog_withApmOff_internetDialogSubTitleVisible() { when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(false); - mInternetDialog.updateDialog(); - final TextView view = mInternetDialog.mDialogView.requireViewById( - R.id.internet_dialog_subtitle); - assertThat(view.getVisibility()).isEqualTo(View.VISIBLE); + mInternetDialog.updateDialog(); + + assertThat(mSubTitle.getVisibility()).isEqualTo(View.VISIBLE); } @Test public void updateDialog_withApmOn_mobileDataLayoutGone() { when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true); - mInternetDialog.updateDialog(); - final LinearLayout linearLayout = mInternetDialog.mDialogView.requireViewById( - R.id.mobile_network_layout); - assertThat(linearLayout.getVisibility()).isEqualTo(View.GONE); + mInternetDialog.updateDialog(); + + assertThat(mMobileDataToggle.getVisibility()).isEqualTo(View.GONE); } @Test From 22306c37b407da867233d0fc15cb0005721b31d3 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Mon, 16 Aug 2021 07:34:27 +0800 Subject: [PATCH 3/4] [RESTRICT AUTOMERGE] [Provider Model] Fix WiFi SSID disappear issue - When WiFi is connected, there will be no internet access for a short time. Need to detect the ConnectivityManager network to assign WiFi to the default network, and make sure that the Wi-Fi connection is ready for internet access. - Refine the main thread functions to avoid calling unnecessary functions Bug: 195893061 Test: manual test atest -c InternetAdapterTest \ InternetDialogControllerTest \ InternetDialogTest Change-Id: I505c9b044f8b139fb6c5d4df415c5ad56ce7b301 (cherry picked from commit 65aa2ec508ca3bdf41ebf49ef9c012ae1fa24f13) --- .../qs/tiles/dialog/InternetAdapter.java | 64 ++---- .../qs/tiles/dialog/InternetDialog.java | 58 ++--- .../dialog/InternetDialogController.java | 87 +++++--- .../qs/tiles/dialog/InternetAdapterTest.java | 58 ++--- .../dialog/InternetDialogControllerTest.java | 208 +++++++++++++----- .../qs/tiles/dialog/InternetDialogTest.java | 27 +-- 6 files changed, 284 insertions(+), 218 deletions(-) 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 91c81bc506c29..52afbe2ebb5fb 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 @@ -24,7 +24,6 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.text.Html; import android.text.TextUtils; -import android.util.Log; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; @@ -34,6 +33,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import com.android.settingslib.Utils; @@ -43,7 +43,6 @@ import com.android.wifitrackerlib.WifiEntry; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; /** * Adapter for showing Wi-Fi networks. @@ -54,9 +53,10 @@ public class InternetAdapter extends RecyclerView.Adapter mWifiEntries; + private int mWifiEntriesCount; protected View mHolderView; protected Context mContext; @@ -76,54 +76,31 @@ public class InternetAdapter extends RecyclerView.Adapter wifiList = getWifiEntryList(); - if (wifiList != null && wifiList.size() != 0) { - int count = getItemCount(); - if (wifiList.size() > count) { - wifiList = getWifiEntryList().subList(0, count - 1); - } - - if (position < wifiList.size()) { - viewHolder.onBind(wifiList.get(position)); - } - } else if (DEBUG) { - Log.d(TAG, "onBindViewHolder, Wi-Fi entry list = null"); + if (mWifiEntries == null || position >= mWifiEntriesCount) { + return; } - } - - private List getWifiEntryList() { - if (mInternetDialogController.getWifiEntryList() == null) { - return null; - } - - return mInternetDialogController.getWifiEntryList().stream() - .filter(wifiEntry -> (!wifiEntry.isDefaultNetwork() - || !wifiEntry.hasInternetAccess())) - .limit(getItemCount()) - .collect(Collectors.toList()); + viewHolder.onBind(mWifiEntries.get(position)); } /** - * The total number of networks (mobile network and entries of Wi-Fi) should be four in - * {@link InternetDialog}. + * Updates the Wi-Fi networks. * - * Airplane mode is ON (mobile network is gone): - * Return four Wi-Fi's entries if no internet Wi-Fi. - * Return three Wi-Fi's entries if one internet Wi-Fi. - * Airplane mode is OFF (mobile network is visible): - * Return three Wi-Fi's entries if no internet Wi-Fi. - * Return two Wi-Fi's entries if one internet Wi-Fi. + * @param wifiEntries the updated Wi-Fi entries. + * @param wifiEntriesCount the total number of Wi-Fi entries. + */ + public void setWifiEntries(@Nullable List wifiEntries, int wifiEntriesCount) { + mWifiEntries = wifiEntries; + mWifiEntriesCount = wifiEntriesCount; + } + + /** + * Gets the total number of Wi-Fi networks. * - * @return The total number of networks. + * @return The total number of Wi-Fi entries. */ @Override public int getItemCount() { - final boolean hasInternetWifi = mInternetDialogController.getInternetWifiEntry() != null; - if (mInternetDialogController.isAirplaneModeEnabled()) { - return hasInternetWifi ? 3 : 4; - } else { - return hasInternetWifi ? 2 : 3; - } + return mWifiEntriesCount; } /** @@ -210,6 +187,9 @@ public class InternetAdapter extends RecyclerView.Adapter wifiEntryList = mInternetDialogController.getWifiEntryList(); - final int wifiListVisibility = - (isDeviceLocked || wifiEntryList == null || wifiEntryList.size() <= 0) - ? View.GONE : View.VISIBLE; - mWifiRecyclerView.setVisibility(wifiListVisibility); - if (wifiListVisibility == View.VISIBLE) { - mAdapter.notifyDataSetChanged(); - } - mSeeAllLayout.setVisibility(wifiListVisibility); + final int visibility = (isDeviceLocked || !isWifiEnabled || mWifiEntriesCount <= 0) + ? View.GONE : View.VISIBLE; + mWifiRecyclerView.setVisibility(visibility); + mSeeAllLayout.setVisibility(visibility); } private void setOnClickListener() { @@ -457,8 +454,7 @@ public class InternetDialog extends SystemUIDialog implements return; } setProgressBarVisible(true); - List wifiScanResults = mWifiManager.getScanResults(); - if (wifiScanResults != null && wifiScanResults.size() > 0) { + if (mConnectedWifiEntry != null || mWifiEntriesCount > 0) { mHandler.postDelayed(mHideProgressBarRunnable, PROGRESS_DELAY_MS); } else if (!mIsSearchingHidden) { mHandler.postDelayed(mHideSearchingRunnable, PROGRESS_DELAY_MS); @@ -543,8 +539,8 @@ public class InternetDialog extends SystemUIDialog implements } @Override + @WorkerThread public void onDataConnectionStateChanged(int state, int networkType) { - mAdapter.notifyDataSetChanged(); mHandler.post(() -> updateDialog()); } @@ -559,10 +555,16 @@ public class InternetDialog extends SystemUIDialog implements } @Override - public void onAccessPointsChanged(List wifiEntryList, WifiEntry connectedEntry) { + @WorkerThread + public void onAccessPointsChanged(@Nullable List wifiEntries, + @Nullable WifiEntry connectedEntry) { mConnectedWifiEntry = connectedEntry; - mAdapter.notifyDataSetChanged(); - mHandler.post(() -> updateDialog()); + mWifiEntriesCount = wifiEntries == null ? 0 : wifiEntries.size(); + mAdapter.setWifiEntries(wifiEntries, mWifiEntriesCount); + mHandler.post(() -> { + mAdapter.notifyDataSetChanged(); + updateDialog(); + }); } @Override @@ -575,24 +577,6 @@ public class InternetDialog extends SystemUIDialog implements } } - @Override - public void onWifiStateReceived(Context context, Intent intent) { - if (intent == null) { - return; - } - - String action = intent.getAction(); - if (action.equals(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)) { - mInternetDialogController.scanWifiAccessPoints(); - showProgressBar(); - return; - } - - if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) { - mHandler.post(() -> updateDialog()); - } - } - public enum InternetDialogEvent implements UiEventLogger.UiEventEnum { @UiEvent(doc = "The Internet dialog became visible on the screen.") INTERNET_DIALOG_SHOW(843); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java index 8838e6bda6fde..dfe78de81f7fb 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java @@ -32,7 +32,6 @@ import android.net.ConnectivityManager; import android.net.Network; import android.net.NetworkCapabilities; import android.net.NetworkRequest; -import android.net.wifi.ScanResult; import android.net.wifi.WifiManager; import android.os.Handler; import android.provider.Settings; @@ -53,6 +52,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; +import androidx.annotation.WorkerThread; import com.android.internal.logging.UiEventLogger; import com.android.keyguard.KeyguardUpdateMonitor; @@ -108,6 +108,8 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, R.string.all_network_unavailable; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); + static final int MAX_WIFI_ENTRY_COUNT = 4; + private WifiManager mWifiManager; private Context mContext; private SubscriptionManager mSubscriptionManager; @@ -122,7 +124,8 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, private AccessPointController mAccessPointController; private IntentFilter mConnectionStateFilter; private InternetDialogCallback mCallback; - private List mWifiEntry; + private WifiEntry mConnectedEntry; + private int mWifiEntriesCount; private UiEventLogger mUiEventLogger; private BroadcastDispatcher mBroadcastDispatcher; private KeyguardUpdateMonitor mKeyguardUpdateMonitor; @@ -132,8 +135,6 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, @VisibleForTesting protected ActivityStarter mActivityStarter; @VisibleForTesting - protected WifiEntry mConnectedEntry; - @VisibleForTesting protected SubscriptionManager.OnSubscriptionsChangedListener mOnSubscriptionsChangedListener; @VisibleForTesting protected InternetTelephonyCallback mInternetTelephonyCallback; @@ -141,9 +142,8 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, protected WifiUtils.InternetIconInjector mWifiIconInjector; @VisibleForTesting protected boolean mCanConfigWifi; - @VisibleForTesting - KeyguardStateController mKeyguardStateController; + protected KeyguardStateController mKeyguardStateController; private final KeyguardUpdateMonitorCallback mKeyguardUpdateCallback = new KeyguardUpdateMonitorCallback() { @@ -185,8 +185,6 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, mKeyguardUpdateMonitor = keyguardUpdateMonitor; mKeyguardStateController = keyguardStateController; mConnectionStateFilter = new IntentFilter(); - mConnectionStateFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); - mConnectionStateFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION); mConnectionStateFilter.addAction(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED); mUiEventLogger = uiEventLogger; mActivityStarter = starter; @@ -291,8 +289,7 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, return mContext.getText(SUBTITLE_TEXT_UNLOCK_TO_VIEW_NETWORKS); } - final List wifiList = mWifiManager.getScanResults(); - if (wifiList != null && wifiList.size() != 0) { + if (mConnectedEntry != null || mWifiEntriesCount > 0) { return mCanConfigWifi ? mContext.getText(SUBTITLE_TEXT_TAP_A_NETWORK_TO_CONNECT) : null; } @@ -576,18 +573,6 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, } } - List getWifiEntryList() { - return mWifiEntry; - } - - WifiEntry getInternetWifiEntry() { - if (mConnectedEntry == null || !mConnectedEntry.isDefaultNetwork() - || !mConnectedEntry.hasInternetAccess()) { - return null; - } - return mConnectedEntry; - } - WifiManager getWifiManager() { return mWifiManager; } @@ -765,22 +750,33 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, } } - void scanWifiAccessPoints() { + private void scanWifiAccessPoints() { if (mCanConfigWifi) { mAccessPointController.scanForAccessPoints(); } } @Override + @WorkerThread public void onAccessPointsChanged(List accessPoints) { - if (accessPoints == null || !mCanConfigWifi) { + if (!mCanConfigWifi) { + return; + } + + if (accessPoints == null || accessPoints.size() == 0) { + mConnectedEntry = null; + mWifiEntriesCount = 0; + if (mCallback != null) { + mCallback.onAccessPointsChanged(null /* wifiEntries */, null /* connectedEntry */); + } return; } boolean hasConnectedWifi = false; - mWifiEntry = accessPoints; - for (WifiEntry wifiEntry : accessPoints) { - if (wifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED) { + final int accessPointSize = accessPoints.size(); + for (int i = 0; i < accessPointSize; i++) { + WifiEntry wifiEntry = accessPoints.get(i); + if (wifiEntry.isDefaultNetwork() && wifiEntry.hasInternetAccess()) { mConnectedEntry = wifiEntry; hasConnectedWifi = true; break; @@ -790,7 +786,23 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, mConnectedEntry = null; } - mCallback.onAccessPointsChanged(mWifiEntry, getInternetWifiEntry()); + int count = MAX_WIFI_ENTRY_COUNT; + if (hasCarrier()) { + count -= 1; + } + if (hasConnectedWifi) { + count -= 1; + } + final List wifiEntries = accessPoints.stream() + .filter(wifiEntry -> (!wifiEntry.isDefaultNetwork() + || !wifiEntry.hasInternetAccess())) + .limit(count) + .collect(Collectors.toList()); + mWifiEntriesCount = wifiEntries == null ? 0 : wifiEntries.size(); + + if (mCallback != null) { + mCallback.onAccessPointsChanged(wifiEntries, mConnectedEntry); + } } @Override @@ -843,8 +855,17 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, private class DataConnectivityListener extends ConnectivityManager.NetworkCallback { @Override + @WorkerThread public void onCapabilitiesChanged(@NonNull Network network, @NonNull NetworkCapabilities networkCapabilities) { + if (mCanConfigWifi) { + for (int transport : networkCapabilities.getTransportTypes()) { + if (transport == NetworkCapabilities.TRANSPORT_WIFI) { + scanWifiAccessPoints(); + break; + } + } + } final Network activeNetwork = mConnectivityManager.getActiveNetwork(); if (activeNetwork != null && activeNetwork.equals(network)) { // update UI @@ -857,11 +878,6 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, @Override public void onReceive(Context context, Intent intent) { final String action = intent.getAction(); - if (mCanConfigWifi && (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION) - || action.equals(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION))) { - mCallback.onWifiStateReceived(context, intent); - } - if (action.equals(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED)) { if (DEBUG) { Log.d(TAG, "ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED"); @@ -917,8 +933,7 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, void dismissDialog(); - void onAccessPointsChanged(List wifiEntryList, WifiEntry connectedEntry); - - void onWifiStateReceived(Context context, Intent intent); + void onAccessPointsChanged(@Nullable List wifiEntries, + @Nullable WifiEntry connectedEntry); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetAdapterTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetAdapterTest.java index 2b9082d7e3035..fa5f70c5a2fcd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetAdapterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetAdapterTest.java @@ -2,8 +2,11 @@ package com.android.systemui.qs.tiles.dialog; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +27,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import java.util.Arrays; +import java.util.List; @SmallTest @RunWith(AndroidTestingRunner.class) @@ -35,6 +39,8 @@ public class InternetAdapterTest extends SysuiTestCase { @Mock private WifiEntry mInternetWifiEntry; @Mock + private List mWifiEntries; + @Mock private WifiEntry mWifiEntry; @Mock private InternetDialogController mInternetDialogController; @@ -56,43 +62,17 @@ public class InternetAdapterTest extends SysuiTestCase { mInternetAdapter = new InternetAdapter(mInternetDialogController); mViewHolder = mInternetAdapter.onCreateViewHolder(new LinearLayout(mContext), 0); - when(mInternetDialogController.getInternetWifiEntry()).thenReturn(mInternetWifiEntry); - when(mInternetDialogController.getWifiEntryList()).thenReturn(Arrays.asList(mWifiEntry)); + mInternetAdapter.setWifiEntries(Arrays.asList(mWifiEntry), 1 /* wifiEntriesCount */); mViewHolder.mWifiIconInjector = mWifiIconInjector; } @Test - public void getItemCount_withApmOnWifiOnNoInternetWifi_returnFour() { - // The preconditions WiFi ON is already in setUp() - when(mInternetDialogController.getInternetWifiEntry()).thenReturn(null); - when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true); + public void getItemCount_returnWifiEntriesCount() { + for (int i = 0; i < InternetDialogController.MAX_WIFI_ENTRY_COUNT; i++) { + mInternetAdapter.setWifiEntries(mWifiEntries, i /* wifiEntriesCount */); - assertThat(mInternetAdapter.getItemCount()).isEqualTo(4); - } - - @Test - public void getItemCount_withApmOnWifiOnHasInternetWifi_returnThree() { - // The preconditions WiFi ON and Internet WiFi are already in setUp() - when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(true); - - assertThat(mInternetAdapter.getItemCount()).isEqualTo(3); - } - - @Test - public void getItemCount_withApmOffWifiOnNoInternetWifi_returnThree() { - // The preconditions WiFi ON is already in setUp() - when(mInternetDialogController.getInternetWifiEntry()).thenReturn(null); - when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(false); - - assertThat(mInternetAdapter.getItemCount()).isEqualTo(3); - } - - @Test - public void getItemCount_withApmOffWifiOnHasInternetWifi_returnTwo() { - // The preconditions WiFi ON and Internet WiFi are already in setUp() - when(mInternetDialogController.isAirplaneModeEnabled()).thenReturn(false); - - assertThat(mInternetAdapter.getItemCount()).isEqualTo(2); + assertThat(mInternetAdapter.getItemCount()).isEqualTo(i); + } } @Test @@ -118,7 +98,17 @@ public class InternetAdapterTest extends SysuiTestCase { } @Test - public void onBindViewHolder_bindDefaultWifiNetwork_getIconWithInternet() { + public void onBindViewHolder_wifiLevelUnreachable_shouldNotGetWifiIcon() { + reset(mWifiIconInjector); + when(mWifiEntry.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_UNREACHABLE); + + mInternetAdapter.onBindViewHolder(mViewHolder, 0); + + verify(mWifiIconInjector, never()).getIcon(anyBoolean(), anyInt()); + } + + @Test + public void onBindViewHolder_shouldNotShowXLevelIcon_getIconWithInternet() { when(mWifiEntry.shouldShowXLevelIcon()).thenReturn(false); mInternetAdapter.onBindViewHolder(mViewHolder, 0); @@ -127,7 +117,7 @@ public class InternetAdapterTest extends SysuiTestCase { } @Test - public void onBindViewHolder_bindNoDefaultWifiNetwork_getIconWithNoInternet() { + public void onBindViewHolder_shouldShowXLevelIcon_getIconWithNoInternet() { when(mWifiEntry.shouldShowXLevelIcon()).thenReturn(true); mInternetAdapter.onBindViewHolder(mViewHolder, 0); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java index a57d439672e93..cacc4095d1412 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java @@ -18,7 +18,6 @@ import android.content.Context; import android.content.Intent; import android.graphics.drawable.Drawable; import android.net.ConnectivityManager; -import android.net.wifi.ScanResult; import android.net.wifi.WifiManager; import android.os.Handler; import android.telephony.ServiceState; @@ -85,14 +84,26 @@ public class InternetDialogControllerTest extends SysuiTestCase { @Mock private WifiEntry mConnectedEntry; @Mock + private WifiEntry mWifiEntry1; + @Mock + private WifiEntry mWifiEntry2; + @Mock + private WifiEntry mWifiEntry3; + @Mock + private WifiEntry mWifiEntry4; + @Mock private ServiceState mServiceState; @Mock private BroadcastDispatcher mBroadcastDispatcher; @Mock private WifiUtils.InternetIconInjector mWifiIconInjector; + @Mock + InternetDialogController.InternetDialogCallback mInternetDialogCallback; private MockInternetDialogController mInternetDialogController; private FakeExecutor mExecutor = new FakeExecutor(new FakeSystemClock()); + private List mAccessPoints = new ArrayList<>(); + private List mWifiEntries = new ArrayList<>(); @Before public void setUp() { @@ -101,6 +112,12 @@ public class InternetDialogControllerTest extends SysuiTestCase { when(mKeyguardStateController.isUnlocked()).thenReturn(true); when(mConnectedEntry.isDefaultNetwork()).thenReturn(true); when(mConnectedEntry.hasInternetAccess()).thenReturn(true); + when(mWifiEntry1.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_DISCONNECTED); + when(mWifiEntry2.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_DISCONNECTED); + when(mWifiEntry3.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_DISCONNECTED); + when(mWifiEntry4.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_DISCONNECTED); + mAccessPoints.add(mConnectedEntry); + mAccessPoints.add(mWifiEntry1); when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[]{SUB_ID}); mInternetDialogController = new MockInternetDialogController(mContext, @@ -110,10 +127,9 @@ public class InternetDialogControllerTest extends SysuiTestCase { mock(KeyguardUpdateMonitor.class), mGlobalSettings, mKeyguardStateController); mSubscriptionManager.addOnSubscriptionsChangedListener(mExecutor, mInternetDialogController.mOnSubscriptionsChangedListener); - mInternetDialogController.onStart( - mock(InternetDialogController.InternetDialogCallback.class), true); + mInternetDialogController.onStart(mInternetDialogCallback, true); + mInternetDialogController.onAccessPointsChanged(mAccessPoints); mInternetDialogController.mActivityStarter = mActivityStarter; - mInternetDialogController.mConnectedEntry = mConnectedEntry; mInternetDialogController.mWifiIconInjector = mWifiIconInjector; } @@ -159,9 +175,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { public void getSubtitleText_withNoWifiEntry_returnSearchWifi() { mInternetDialogController.setAirplaneModeEnabled(false); when(mWifiManager.isWifiEnabled()).thenReturn(true); - List wifiScanResults = mock(ArrayList.class); - doReturn(0).when(wifiScanResults).size(); - when(mWifiManager.getScanResults()).thenReturn(wifiScanResults); + mInternetDialogController.onAccessPointsChanged(null /* accessPoints */); assertThat(mInternetDialogController.getSubtitleText(true)) .isEqualTo(getResourcesString("wifi_empty_list_wifi_on")); @@ -175,11 +189,9 @@ public class InternetDialogControllerTest extends SysuiTestCase { @Test public void getSubtitleText_withWifiEntry_returnTapToConnect() { + // The preconditions WiFi Entries is already in setUp() mInternetDialogController.setAirplaneModeEnabled(false); when(mWifiManager.isWifiEnabled()).thenReturn(true); - List wifiScanResults = mock(ArrayList.class); - doReturn(1).when(wifiScanResults).size(); - when(mWifiManager.getScanResults()).thenReturn(wifiScanResults); assertThat(mInternetDialogController.getSubtitleText(false)) .isEqualTo(getResourcesString("tap_a_network_to_connect")); @@ -205,9 +217,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { public void getSubtitleText_withNoService_returnNoNetworksAvailable() { mInternetDialogController.setAirplaneModeEnabled(false); when(mWifiManager.isWifiEnabled()).thenReturn(true); - List wifiScanResults = new ArrayList<>(); - doReturn(wifiScanResults).when(mWifiManager).getScanResults(); - when(mWifiManager.getScanResults()).thenReturn(wifiScanResults); + mInternetDialogController.onAccessPointsChanged(null /* accessPoints */); doReturn(ServiceState.STATE_OUT_OF_SERVICE).when(mServiceState).getState(); doReturn(mServiceState).when(mTelephonyManager).getServiceState(); @@ -221,9 +231,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { public void getSubtitleText_withMobileDataDisabled_returnNoOtherAvailable() { mInternetDialogController.setAirplaneModeEnabled(false); when(mWifiManager.isWifiEnabled()).thenReturn(true); - List wifiScanResults = new ArrayList<>(); - doReturn(wifiScanResults).when(mWifiManager).getScanResults(); - when(mWifiManager.getScanResults()).thenReturn(wifiScanResults); + mInternetDialogController.onAccessPointsChanged(null /* accessPoints */); doReturn(ServiceState.STATE_IN_SERVICE).when(mServiceState).getState(); doReturn(mServiceState).when(mTelephonyManager).getServiceState(); @@ -240,38 +248,9 @@ public class InternetDialogControllerTest extends SysuiTestCase { .isNotEqualTo(getResourcesString("non_carrier_network_unavailable")); } - @Test - public void getInternetWifiEntry_connectedEntryIsNull_returnNull() { - mInternetDialogController.mConnectedEntry = null; - - assertThat(mInternetDialogController.getInternetWifiEntry()).isNull(); - } - - @Test - public void getInternetWifiEntry_connectedWifiIsNotDefaultNetwork_returnNull() { - when(mConnectedEntry.isDefaultNetwork()).thenReturn(false); - - assertThat(mInternetDialogController.getInternetWifiEntry()).isNull(); - } - - @Test - public void getInternetWifiEntry_connectedWifiHasNotInternetAccess_returnNull() { - when(mConnectedEntry.hasInternetAccess()).thenReturn(false); - - assertThat(mInternetDialogController.getInternetWifiEntry()).isNull(); - } - - @Test - public void getInternetWifiEntry_connectedEntryIsInternetWifi_returnConnectedEntry() { - // The preconditions have been set in setUp(). - // - The connected Wi-Fi entry have both default network and internet access conditions. - - assertThat(mInternetDialogController.getInternetWifiEntry()).isEqualTo(mConnectedEntry); - } - @Test public void getWifiDetailsSettingsIntent_withNoConnectedEntry_returnNull() { - mInternetDialogController.mConnectedEntry = null; + mInternetDialogController.onAccessPointsChanged(null /* accessPoints */); assertThat(mInternetDialogController.getWifiDetailsSettingsIntent()).isNull(); } @@ -303,7 +282,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { @Test public void launchWifiNetworkDetailsSetting_withNoConnectedEntry_doNothing() { - mInternetDialogController.mConnectedEntry = null; + mInternetDialogController.onAccessPointsChanged(null /* accessPoints */); mInternetDialogController.launchWifiNetworkDetailsSetting(); @@ -335,13 +314,140 @@ public class InternetDialogControllerTest extends SysuiTestCase { } @Test - public void scanWifiAccessPoints_cannotConfigWifi_doNothing() { - reset(mAccessPointController); + public void onAccessPointsChanged_canNotConfigWifi_doNothing() { + reset(mInternetDialogCallback); mInternetDialogController.mCanConfigWifi = false; - mInternetDialogController.scanWifiAccessPoints(); + mInternetDialogController.onAccessPointsChanged(null /* accessPoints */); - verify(mAccessPointController, never()).scanForAccessPoints(); + verify(mInternetDialogCallback, never()).onAccessPointsChanged(any(), any()); + } + + @Test + public void onAccessPointsChanged_nullAccessPoints_callbackBothNull() { + reset(mInternetDialogCallback); + + mInternetDialogController.onAccessPointsChanged(null /* accessPoints */); + + verify(mInternetDialogCallback) + .onAccessPointsChanged(null /* wifiEntries */, null /* connectedEntry */); + } + + @Test + public void onAccessPointsChanged_oneConnectedEntry_callbackConnectedEntryOnly() { + reset(mInternetDialogCallback); + mInternetDialogController.setAirplaneModeEnabled(true); + mAccessPoints.clear(); + mAccessPoints.add(mConnectedEntry); + + mInternetDialogController.onAccessPointsChanged(mAccessPoints); + + mWifiEntries.clear(); + verify(mInternetDialogCallback).onAccessPointsChanged(mWifiEntries, mConnectedEntry); + } + + @Test + public void onAccessPointsChanged_noConnectedEntryAndOneOther_callbackWifiEntriesOnly() { + reset(mInternetDialogCallback); + mInternetDialogController.setAirplaneModeEnabled(true); + mAccessPoints.clear(); + mAccessPoints.add(mWifiEntry1); + + mInternetDialogController.onAccessPointsChanged(mAccessPoints); + + mWifiEntries.clear(); + mWifiEntries.add(mWifiEntry1); + verify(mInternetDialogCallback) + .onAccessPointsChanged(mWifiEntries, null /* connectedEntry */); + } + + @Test + public void onAccessPointsChanged_oneConnectedEntryAndOneOther_callbackCorrectly() { + reset(mInternetDialogCallback); + mInternetDialogController.setAirplaneModeEnabled(true); + mAccessPoints.clear(); + mAccessPoints.add(mConnectedEntry); + mAccessPoints.add(mWifiEntry1); + + mInternetDialogController.onAccessPointsChanged(mAccessPoints); + + mWifiEntries.clear(); + mWifiEntries.add(mWifiEntry1); + verify(mInternetDialogCallback).onAccessPointsChanged(mWifiEntries, mConnectedEntry); + } + + @Test + public void onAccessPointsChanged_oneConnectedEntryAndTwoOthers_callbackCorrectly() { + reset(mInternetDialogCallback); + mInternetDialogController.setAirplaneModeEnabled(true); + mAccessPoints.clear(); + mAccessPoints.add(mConnectedEntry); + mAccessPoints.add(mWifiEntry1); + mAccessPoints.add(mWifiEntry2); + + mInternetDialogController.onAccessPointsChanged(mAccessPoints); + + mWifiEntries.clear(); + mWifiEntries.add(mWifiEntry1); + mWifiEntries.add(mWifiEntry2); + verify(mInternetDialogCallback).onAccessPointsChanged(mWifiEntries, mConnectedEntry); + } + + @Test + public void onAccessPointsChanged_oneConnectedEntryAndThreeOthers_callbackCutMore() { + reset(mInternetDialogCallback); + mInternetDialogController.setAirplaneModeEnabled(true); + mAccessPoints.clear(); + mAccessPoints.add(mConnectedEntry); + mAccessPoints.add(mWifiEntry1); + mAccessPoints.add(mWifiEntry2); + mAccessPoints.add(mWifiEntry3); + + mInternetDialogController.onAccessPointsChanged(mAccessPoints); + + mWifiEntries.clear(); + mWifiEntries.add(mWifiEntry1); + mWifiEntries.add(mWifiEntry2); + mWifiEntries.add(mWifiEntry3); + verify(mInternetDialogCallback).onAccessPointsChanged(mWifiEntries, mConnectedEntry); + + // Turn off airplane mode to has carrier network, then Wi-Fi entries will cut last one. + reset(mInternetDialogCallback); + mInternetDialogController.setAirplaneModeEnabled(false); + + mInternetDialogController.onAccessPointsChanged(mAccessPoints); + + mWifiEntries.remove(mWifiEntry3); + verify(mInternetDialogCallback).onAccessPointsChanged(mWifiEntries, mConnectedEntry); + } + + @Test + public void onAccessPointsChanged_oneConnectedEntryAndFourOthers_callbackCutMore() { + reset(mInternetDialogCallback); + mInternetDialogController.setAirplaneModeEnabled(true); + mAccessPoints.clear(); + mAccessPoints.add(mConnectedEntry); + mAccessPoints.add(mWifiEntry1); + mAccessPoints.add(mWifiEntry2); + mAccessPoints.add(mWifiEntry3); + mAccessPoints.add(mWifiEntry4); + + mInternetDialogController.onAccessPointsChanged(mAccessPoints); + + mWifiEntries.clear(); + mWifiEntries.add(mWifiEntry1); + mWifiEntries.add(mWifiEntry2); + mWifiEntries.add(mWifiEntry3); + verify(mInternetDialogCallback).onAccessPointsChanged(mWifiEntries, mConnectedEntry); + + // Turn off airplane mode to has carrier network, then Wi-Fi entries will cut last one. + reset(mInternetDialogCallback); + mInternetDialogController.setAirplaneModeEnabled(false); + + mInternetDialogController.onAccessPointsChanged(mAccessPoints); + + mWifiEntries.remove(mWifiEntry3); + verify(mInternetDialogCallback).onAccessPointsChanged(mWifiEntries, mConnectedEntry); } private String getResourcesString(String name) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java index 87e81e40a043d..fa9c0538e9bd4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java @@ -12,7 +12,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.net.wifi.ScanResult; import android.net.wifi.WifiManager; import android.os.Handler; import android.telephony.TelephonyManager; @@ -38,8 +37,6 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; @SmallTest @@ -61,7 +58,7 @@ public class InternetDialogTest extends SysuiTestCase { @Mock private WifiEntry mInternetWifiEntry; @Mock - private WifiEntry mWifiEntry; + private List mWifiEntries; @Mock private InternetAdapter mInternetAdapter; @Mock @@ -85,20 +82,17 @@ public class InternetDialogTest extends SysuiTestCase { when(mInternetWifiEntry.getSummary(false)).thenReturn(WIFI_SUMMARY); when(mInternetWifiEntry.isDefaultNetwork()).thenReturn(true); when(mInternetWifiEntry.hasInternetAccess()).thenReturn(true); - when(mWifiEntry.getTitle()).thenReturn(WIFI_TITLE); - when(mWifiEntry.getSummary(false)).thenReturn(WIFI_SUMMARY); + when(mWifiEntries.size()).thenReturn(1); when(mInternetDialogController.getMobileNetworkTitle()).thenReturn(MOBILE_NETWORK_TITLE); when(mInternetDialogController.getMobileNetworkSummary()) .thenReturn(MOBILE_NETWORK_SUMMARY); when(mInternetDialogController.getWifiManager()).thenReturn(mWifiManager); - when(mInternetDialogController.getInternetWifiEntry()).thenReturn(mInternetWifiEntry); - when(mInternetDialogController.getWifiEntryList()).thenReturn(Arrays.asList(mWifiEntry)); mInternetDialog = new InternetDialog(mContext, mock(InternetDialogFactory.class), mInternetDialogController, true, true, true, mock(UiEventLogger.class), mHandler); mInternetDialog.mAdapter = mInternetAdapter; - mInternetDialog.mConnectedWifiEntry = mInternetWifiEntry; + mInternetDialog.onAccessPointsChanged(mWifiEntries, mInternetWifiEntry); mInternetDialog.show(); mDialogView = mInternetDialog.mDialogView; @@ -165,7 +159,8 @@ public class InternetDialogTest extends SysuiTestCase { @Test public void updateDialog_wifiOnAndNoConnectedWifi_hideConnectedWifi() { - mInternetDialog.mConnectedWifiEntry = null; + // The precondition WiFi ON is already in setUp() + mInternetDialog.onAccessPointsChanged(mWifiEntries, null /* connectedEntry*/); doReturn(false).when(mInternetDialogController).activeNetworkIsCellular(); mInternetDialog.updateDialog(); @@ -175,7 +170,8 @@ public class InternetDialogTest extends SysuiTestCase { @Test public void updateDialog_wifiOnAndNoWifiList_hideWifiListAndSeeAll() { - when(mInternetDialogController.getWifiEntryList()).thenReturn(null); + // The precondition WiFi ON is already in setUp() + mInternetDialog.onAccessPointsChanged(null /* wifiEntries */, mInternetWifiEntry); mInternetDialog.updateDialog(); @@ -258,9 +254,6 @@ public class InternetDialogTest extends SysuiTestCase { public void showProgressBar_wifiEnabledWithWifiEntry_showProgressBarThenHide() { Mockito.reset(mHandler); when(mWifiManager.isWifiEnabled()).thenReturn(true); - List wifiScanResults = mock(ArrayList.class); - when(wifiScanResults.size()).thenReturn(1); - when(mWifiManager.getScanResults()).thenReturn(wifiScanResults); mInternetDialog.showProgressBar(); @@ -277,12 +270,10 @@ public class InternetDialogTest extends SysuiTestCase { } @Test - public void showProgressBar_wifiEnabledWithoutWifiScanResults_showProgressBarThenHideSearch() { + public void showProgressBar_wifiEnabledWithoutWifiEntries_showProgressBarThenHideSearch() { Mockito.reset(mHandler); when(mWifiManager.isWifiEnabled()).thenReturn(true); - List wifiScanResults = mock(ArrayList.class); - when(wifiScanResults.size()).thenReturn(0); - when(mWifiManager.getScanResults()).thenReturn(wifiScanResults); + mInternetDialog.onAccessPointsChanged(null /* wifiEntries */, null /* connectedEntry*/); mInternetDialog.showProgressBar(); From fc0d0bc3f50ffd1d3a4bd7705381e7f6063a48cc Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Tue, 17 Aug 2021 12:13:29 +0800 Subject: [PATCH 4/4] [RESTRICT AUTOMERGE] [Provider Model] Support 2+ lines instead of marque for Mobile data and Wi-Fi - Also fix the Wi-Fi's margin - Fix the screen for large screen and tablet - Match parent's width for other devices Bug: 194970610 Test: manual Change-Id: I61c32c7454771583e252c5d23f5d41728472c41b (cherry picked from commit afd9b951fce3fb6c212ce7b4de07d8e71d61f7c9) --- .../layout/internet_connectivity_dialog.xml | 45 +++++++++---------- .../res/layout/internet_list_item.xml | 36 +++++++-------- .../SystemUI/res/values-sw600dp/dimens.xml | 3 ++ packages/SystemUI/res/values/dimens.xml | 7 +-- .../qs/tiles/dialog/InternetAdapter.java | 3 -- .../qs/tiles/dialog/InternetDialog.java | 18 +++++--- 6 files changed, 55 insertions(+), 57 deletions(-) diff --git a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml index 3aa2e5aca2a79..b841419c1c752 100644 --- a/packages/SystemUI/res/layout/internet_connectivity_dialog.xml +++ b/packages/SystemUI/res/layout/internet_connectivity_dialog.xml @@ -30,7 +30,7 @@ style="@style/Widget.SliceView.Panel" android:gravity="center_vertical|center_horizontal" android:layout_marginTop="24dp" - android:layout_marginBottom="16dp" + android:layout_marginBottom="@dimen/internet_dialog_network_layout_margin" android:orientation="vertical"> @@ -130,24 +130,24 @@ @@ -179,8 +179,8 @@ android:background="?android:attr/selectableItemBackground" android:gravity="center" android:orientation="horizontal" - android:layout_marginEnd="@dimen/settingslib_switchbar_margin" - android:layout_marginStart="@dimen/settingslib_switchbar_margin" + android:layout_marginEnd="@dimen/internet_dialog_network_layout_margin" + android:layout_marginStart="@dimen/internet_dialog_network_layout_margin" android:paddingStart="22dp" android:paddingEnd="22dp"> @@ -230,10 +230,10 @@ android:visibility="gone" android:background="?android:attr/selectableItemBackground" android:orientation="horizontal" - android:layout_marginEnd="@dimen/settingslib_switchbar_margin" - android:layout_marginStart="@dimen/settingslib_switchbar_margin" - android:paddingStart="22dp" - android:paddingEnd="22dp"> + android:layout_marginStart="@dimen/internet_dialog_network_layout_margin" + android:layout_marginEnd="@dimen/internet_dialog_network_layout_margin" + android:paddingStart="20dp" + android:paddingEnd="24dp"> @@ -273,9 +273,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical|start" - android:layout_marginStart="16dp" + android:layout_marginStart="@dimen/internet_dialog_network_layout_margin" android:ellipsize="end" - android:maxLines="1" android:textColor="?android:attr/textColorTertiary" android:textSize="14sp" android:fontFamily="google-sans"/> @@ -284,14 +283,14 @@ @@ -324,7 +323,7 @@ android:layout_height="24dp" android:clickable="false" android:layout_gravity="center_vertical|start" - android:layout_marginStart="16dp"> + android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"> + android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"> - + android:paddingStart="20dp" + android:paddingEnd="40dp"> + android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"> + android:layout_height="72dp" + android:layout_weight="1" + android:gravity="start|center_vertical" + android:layout_marginStart="@dimen/internet_dialog_network_layout_margin"> + android:fontFamily="google-sans" + android:layout_marginEnd="18dp"/> + android:fontFamily="google-sans" + android:layout_marginEnd="18dp"/> + android:layout_gravity="end|center_vertical"> diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml index c2aad2d11c1d0..d921d49580905 100644 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml @@ -103,4 +103,7 @@ 0dp + + + 624dp diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 5c8e5b50c5dce..956e3c46214a7 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -1604,15 +1604,16 @@ 12dp 646dp - 412dp + @dimen/match_parent 24dp 24dp - - + + 16dp + 16dp 52dp 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 52afbe2ebb5fb..4e897d9a86673 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 @@ -175,12 +175,9 @@ public class InternetAdapter extends RecyclerView.Adapter { // Set max height for list - if (mInternetListLayout.getHeight() > mListMaxHeight) { - ViewGroup.LayoutParams params = mInternetListLayout.getLayoutParams(); + if (mInternetDialogLayout.getHeight() > mListMaxHeight) { + ViewGroup.LayoutParams params = mInternetDialogLayout.getLayoutParams(); params.height = mListMaxHeight; - mInternetListLayout.setLayoutParams(params); + mInternetDialogLayout.setLayoutParams(params); } }; @@ -180,7 +181,7 @@ public class InternetDialog extends SystemUIDialog implements }; mListMaxHeight = context.getResources().getDimensionPixelSize( R.dimen.internet_dialog_list_max_height); - mListMaxWidth = context.getResources().getDimensionPixelSize( + mLayoutWidth = context.getResources().getDimensionPixelSize( R.dimen.internet_dialog_list_max_width); mUiEventLogger = uiEventLogger; mAdapter = new InternetAdapter(mInternetDialogController); @@ -208,11 +209,14 @@ public class InternetDialog extends SystemUIDialog implements layoutParams.setFitInsetsIgnoringVisibility(true); window.setAttributes(layoutParams); window.setContentView(mDialogView); - window.setLayout(mListMaxWidth, ViewGroup.LayoutParams.WRAP_CONTENT); + //Only fix the width for large screen or tablet. + window.setLayout(mContext.getResources().getDimensionPixelSize( + R.dimen.internet_dialog_list_max_width), ViewGroup.LayoutParams.WRAP_CONTENT); window.setWindowAnimations(R.style.Animation_InternetDialog); window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); window.addFlags(FLAG_LAYOUT_NO_LIMITS); + mInternetDialogLayout = mDialogView.requireViewById(R.id.internet_connectivity_dialog); mInternetDialogTitle = mDialogView.requireViewById(R.id.internet_dialog_title); mInternetDialogSubTitle = mDialogView.requireViewById(R.id.internet_dialog_subtitle); mDivider = mDialogView.requireViewById(R.id.divider); @@ -237,7 +241,7 @@ public class InternetDialog extends SystemUIDialog implements mMobileDataToggle = mDialogView.requireViewById(R.id.mobile_toggle); mWiFiToggle = mDialogView.requireViewById(R.id.wifi_toggle); mBackgroundOn = mContext.getDrawable(R.drawable.settingslib_switch_bar_bg_on); - mInternetListLayout.getViewTreeObserver().addOnGlobalLayoutListener( + mInternetDialogLayout.getViewTreeObserver().addOnGlobalLayoutListener( mInternetListLayoutListener); mInternetDialogTitle.setText(getDialogTitleText()); mInternetDialogTitle.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);