Merge "[QSDetailedView] clean up the unused function in InternetDetailsContentManager" into main (b685d3a6) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentManager.kt

+6 −20

Original line number	Diff line number	Diff line
		@@ -400,7 +400,9 @@ constructor(
		}
		alertDialog =
		AlertDialog.Builder(context)
		.setTitle(context.getString(R.string.auto_data_switch_disable_title, carrierName))
		.setTitle(
		context.getString(R.string.auto_data_switch_disable_title, carrierName)
		)
		.setMessage(R.string.auto_data_switch_disable_message)
		.setNegativeButton(R.string.auto_data_switch_dialog_negative_button) { _, _ -> }
		.setPositiveButton(R.string.auto_data_switch_dialog_positive_button) { _, _ ->
		@@ -429,7 +431,6 @@ constructor(
		}

		private fun showTurnOffMobileDialog() {
		val context = contentView.context
		var carrierName: CharSequence? = getMobileNetworkTitle(defaultDataSubId)
		val isInService: Boolean =
		internetDetailsContentController.isVoiceStateInService(defaultDataSubId)
		@@ -439,7 +440,9 @@ constructor(
		alertDialog =
		AlertDialog.Builder(context)
		.setTitle(R.string.mobile_data_disable_title)
		.setMessage(context.getString(R.string.mobile_data_disable_message, carrierName))
		.setMessage(
		context.getString(R.string.mobile_data_disable_message, carrierName)
		)
		.setNegativeButton(android.R.string.cancel) { _: DialogInterface?, _: Int -> }
		.setPositiveButton(
		com.android.internal.R.string.alert_windows_notification_turn_off_action
		@@ -458,7 +461,6 @@ constructor(
		SystemUIDialog.setShowForAllUsers(alertDialog, true)
		SystemUIDialog.registerDismissListener(alertDialog)
		SystemUIDialog.setWindowOnTop(alertDialog, keyguard.isShowing())

		alertDialog!!.show()
		}

		@@ -828,22 +830,6 @@ constructor(
		)
		}

		/**
		* Handles window focus changes. If the activity loses focus and the system UI dialog is
		* showing, it dismisses the current alert dialog to prevent it from persisting in the
		* background.
		*
		* @param dialog The internet system UI dialog whose focus state has changed.
		* @param hasFocus True if the window has gained focus, false otherwise.
		*/
		fun onWindowFocusChanged(dialog: SystemUIDialog, hasFocus: Boolean) {
		if (alertDialog != null && !alertDialog!!.isShowing) {
		if (!hasFocus && dialog.isShowing) {
		dialog.dismiss()
		}
		}
		}

		private fun getDefaultCarrierName(): String? {
		return context.getString(R.string.mobile_data_disable_message_default_carrier)
		}