Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Provider Model] Remove the flag of ProviderModel in InternetTile" into sc-qpr1-dev am: 50bdf2b540

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546423

Change-Id: Ib821723a38b6c98b471af951958fffdf1955001b
This commit is contained in:
Zoey Chen
2021-08-25 14:20:17 +00:00
committed by Automerger Merge Worker
parent b152d932d4 50bdf2b540
commit 0ead1a7aa5
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java
View File

@@ -28,7 +28,6 @@ import android.provider.Settings;
import android.service.quicksettings.Tile; import android.service.quicksettings.Tile;
import android.text.Html; import android.text.Html;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.FeatureFlagUtils;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.Switch; import android.widget.Switch;
@@ -68,8 +67,6 @@ import javax.inject.Inject;
/** Quick settings tile: Internet **/ /** Quick settings tile: Internet **/
public class InternetTile extends QSTileImpl<SignalState> { public class InternetTile extends QSTileImpl<SignalState> {
private static final Intent WIFI_SETTINGS = new Intent(Settings.ACTION_WIFI_SETTINGS); private static final Intent WIFI_SETTINGS = new Intent(Settings.ACTION_WIFI_SETTINGS);
private static final Intent INTERNET_PANEL =
new Intent(Settings.Panel.ACTION_INTERNET_CONNECTIVITY);
protected final NetworkController mController; protected final NetworkController mController;
private final DataUsageController mDataController; private final DataUsageController mDataController;
@@ -121,13 +118,9 @@ public class InternetTile extends QSTileImpl<SignalState> {
@Override @Override
protected void handleClick(@Nullable View view) { protected void handleClick(@Nullable View view) {
if (!FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) { mHandler.post(() -> {
mActivityStarter.postStartActivityDismissingKeyguard(INTERNET_PANEL, 0); mInternetDialogFactory.create(true);
} else { });
mHandler.post(() -> {
mInternetDialogFactory.create(true);
});
}
} }
@Override @Override