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

Merge "Mobile data can be turned off from keyguard"

Browse Source
This commit is contained in:
Fabian Kozynski
2019-03-27 14:56:09 +00:00
committed by Android (Google) Code Review
parent 04d356ae73 88a1fe5e2b
commit 648db745cd
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java
View File

@@ -45,7 +45,6 @@ import com.android.systemui.qs.CellTileView;
import com.android.systemui.qs.QSHost;
import com.android.systemui.qs.tileimpl.QSTileImpl;
import com.android.systemui.statusbar.phone.SystemUIDialog;
import com.android.systemui.statusbar.policy.KeyguardMonitor;
import com.android.systemui.statusbar.policy.NetworkController;
import com.android.systemui.statusbar.policy.NetworkController.IconState;
import com.android.systemui.statusbar.policy.NetworkController.SignalCallback;
@@ -62,15 +61,13 @@ public class CellularTile extends QSTileImpl<SignalState> {
private final CellSignalCallback mSignalCallback = new CellSignalCallback();
private final ActivityStarter mActivityStarter;
private final KeyguardMonitor mKeyguardMonitor;
@Inject
public CellularTile(QSHost host, NetworkController networkController,
ActivityStarter activityStarter, KeyguardMonitor keyguardMonitor) {
ActivityStarter activityStarter) {
super(host);
mController = networkController;
mActivityStarter = activityStarter;
mKeyguardMonitor = keyguardMonitor;
mDataController = mController.getMobileDataController();
mDetailAdapter = new CellularDetailAdapter();
mController.observe(getLifecycle(), mSignalCallback);
@@ -106,11 +103,7 @@ public class CellularTile extends QSTileImpl<SignalState> {
return;
}
if (mDataController.isMobileDataEnabled()) {
if (mKeyguardMonitor.isSecure() && !mKeyguardMonitor.canSkipBouncer()) {
mActivityStarter.postQSRunnableDismissingKeyguard(this::maybeShowDisableDialog);
} else {
mUiHandler.post(this::maybeShowDisableDialog);
}
maybeShowDisableDialog();
} else {
mDataController.setMobileDataEnabled(true);
}