Merge "[Provider Model] Remove Wi-Fi switch menu in internet panel" into sc-dev am: 22f6857a6a am: 4cbdf9d17a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076801

Change-Id: I20c21a9f47793f371c23cd76dbe8402e8e5ac4f5

src/com/android/settings/panel/InternetConnectivityPanel.java

@@ -39,7 +39,6 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;
 
@@ -236,29 +235,17 @@ public class InternetConnectivityPanel implements PanelContent, LifecycleObserve
 
     @Override
     public Intent getSeeMoreIntent() {
+        // Disable the see more button for provider model design.
+        if (mIsProviderModelEnabled) {
+            return null;
+        }
+
         // Don't remove the see more intent for non-provider model design. This intent will be
         // used when isCustomizedButtonUsed() returns false.
         return new Intent(Settings.ACTION_WIRELESS_SETTINGS)
                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
     }
 
-    @Override
-    public boolean isCustomizedButtonUsed() {
-        return mIsProviderModelEnabled;
-    }
-
-    @Override
-    public CharSequence getCustomizedButtonTitle() {
-        return mContext.getText(
-                mInternetUpdater.isWifiEnabled() ? R.string.turn_off_wifi : R.string.turn_on_wifi);
-    }
-
-    @Override
-    public void onClickCustomizedButton(FragmentActivity panelActivity) {
-        // Don't finish the panel activity
-        mWifiManager.setWifiEnabled(!mInternetUpdater.isWifiEnabled());
-    }
-
     @Override
     public boolean isProgressBarVisible() {
         return mIsProgressBarVisible;
@@ -320,7 +307,6 @@ public class InternetConnectivityPanel implements PanelContent, LifecycleObserve
         }
         updateSubtitleText();
         mCallback.onHeaderChanged();
-        mCallback.onCustomizedButtonStateChanged();
     }
 
     @VisibleForTesting