Merge remote-tracking branch 'origin/lineage-20.0' into v1-t (4ca801ff) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -288,6 +288,7 @@ public class InternetDialog extends SystemUIDialog implements
		mHandler.removeCallbacks(mHideProgressBarRunnable);
		mHandler.removeCallbacks(mHideSearchingRunnable);
		mMobileNetworkLayout.setOnClickListener(null);
		mMobileNetworkLayout.setOnLongClickListener(null);
		mMobileDataToggle.setOnCheckedChangeListener(null);
		mConnectedWifListLayout.setOnClickListener(null);
		if (mSecondaryMobileNetworkLayout != null) {
		@@ -358,6 +359,13 @@ public class InternetDialog extends SystemUIDialog implements
		}
		}
		});
		mMobileNetworkLayout.setOnLongClickListener(v -> {
		if (!mInternetDialogController.isDeviceLocked()) {
		mInternetDialogController.launchMobileNetworkSettings(v, mDefaultDataSubId);
		return true;
		}
		return false;
		});
		mMobileDataToggle.setOnCheckedChangeListener(
		(buttonView, isChecked) -> {
		if (!isChecked && shouldShowMobileDialog()) {

+4 −0

Original line number	Diff line number	Diff line
		@@ -739,6 +739,10 @@ public class InternetDialogController implements AccessPointController.AccessPoi

		void launchMobileNetworkSettings(View view) {
		final int subId = getActiveAutoSwitchNonDdsSubId();
		launchMobileNetworkSettings(view, subId);
		}

		void launchMobileNetworkSettings(View view, int subId) {
		if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
		Log.w(TAG, "launchMobileNetworkSettings fail, invalid subId:" + subId);
		return;