[Provider Model] Remove Wi-Fi switch menu in internet panel

- Remove "Turn on/off Wi-Fi" menu in internet panel

- Don't show the default "See more" menu in internet panel also.

Bug: 189912933
Test: manual test
atest -c InternetConnectivityPanelTest

Change-Id: I3a9927e356e0f7e534b1e2ba848d2b6d2a5bd858
This commit is contained in:
Weng Su
2021-06-23 17:55:42 +08:00
parent e68805950d
commit 9395d39063
2 changed files with 11 additions and 79 deletions

View File

@@ -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