From 6265679707a05222794ac9ad1f0347b3a9f162ea Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Wed, 27 Oct 2021 11:48:21 +0800 Subject: [PATCH] [Provier Model] Remove the redundant code in the Internet Dialog Bug: 204042506 Bug: 204041443 Bug: 204255534 Test: atest InternetDialogTest, InternetDialogControllerTest Change-Id: I0acbe0a1495a8ba5f3df2d2393eca830679efcf7 --- .../systemui/qs/tiles/dialog/InternetDialog.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) 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 204dd46189d80..1dab26352fc65 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 @@ -80,7 +80,6 @@ public class InternetDialog extends SystemUIDialog implements private final Handler mHandler; private final Executor mBackgroundExecutor; - private final LinearLayoutManager mLayoutManager; @VisibleForTesting protected InternetAdapter mAdapter; @@ -161,12 +160,6 @@ public class InternetDialog extends SystemUIDialog implements mCanConfigMobileData = canConfigMobileData; mCanConfigWifi = canConfigWifi; - mLayoutManager = new LinearLayoutManager(mContext) { - @Override - public boolean canScrollVertically() { - return false; - } - }; mUiEventLogger = uiEventLogger; mAdapter = new InternetAdapter(mInternetDialogController); if (!aboveStatusBar) { @@ -218,7 +211,7 @@ public class InternetDialog extends SystemUIDialog implements setOnClickListener(); mTurnWifiOnLayout.setBackground(null); - mWifiRecyclerView.setLayoutManager(mLayoutManager); + mWifiRecyclerView.setLayoutManager(new LinearLayoutManager(mContext)); mWifiRecyclerView.setAdapter(mAdapter); } @@ -469,10 +462,6 @@ public class InternetDialog extends SystemUIDialog implements } private void setProgressBarVisible(boolean visible) { - if (mWifiManager.isWifiEnabled() && mAdapter.mHolderView != null - && mAdapter.mHolderView.isAttachedToWindow()) { - mIsProgressBarVisible = true; - } mIsProgressBarVisible = visible; mProgressBar.setVisibility(mIsProgressBarVisible ? View.VISIBLE : View.GONE); mDivider.setVisibility(mIsProgressBarVisible ? View.GONE : View.VISIBLE);