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

Merge "Merge "Only show mobile data turn off dialog once." into pi-dev am: cb87872137" into pi-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2018-04-11 23:05:37 +00:00
committed by Android (Google) Code Review
parent 00c470bf74 7bb72d632c
commit 2c2f6b80a7
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,20 +108,21 @@ public class CellularTile extends QSTileImpl<SignalState> {
}
if (mDataController.isMobileDataEnabled()) {
if (mKeyguardMonitor.isSecure() && !mKeyguardMonitor.canSkipBouncer()) {
mActivityStarter.postQSRunnableDismissingKeyguard(this::showDisableDialog);
mActivityStarter.postQSRunnableDismissingKeyguard(this::maybeShowDisableDialog);
} else {
if (Prefs.getBoolean(mContext, QS_HAS_TURNED_OFF_MOBILE_DATA, false)) {
mDataController.setMobileDataEnabled(false);
} else {
mUiHandler.post(this::showDisableDialog);
}
mUiHandler.post(this::maybeShowDisableDialog);
}
} else {
mDataController.setMobileDataEnabled(true);
}
}
private void showDisableDialog() {
private void maybeShowDisableDialog() {
if (Prefs.getBoolean(mContext, QS_HAS_TURNED_OFF_MOBILE_DATA, false)) {
// Directly turn off mobile data if the user has seen the dialog before.
mDataController.setMobileDataEnabled(false);
return;
}
mHost.collapsePanels();
String carrierName = mController.getMobileDataNetworkName();
if (TextUtils.isEmpty(carrierName)) {