Merge "[QSDetailedView] Add a11y labels for internet details" into main (55bd7a2b) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/internet_connectivity_details.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -353,7 +353,6 @@

		<ImageView
		android:id="@+id/arrow_forward"
		android:contentDescription="@string/see_all_networks"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		@@ -542,7 +541,6 @@
		android:clickable="false">

		<ImageView
		android:contentDescription="@string/share_wifi_button_text"
		android:src="@drawable/ic_screenshot_share"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"

+7 −5

Original line number	Diff line number	Diff line
		@@ -346,7 +346,8 @@ constructor(
		seeAllLayout = contentView.requireViewById(R.id.see_all_layout)

		// Set click listeners for Wi-Fi related views
		wifiToggle.setOnClickListener {
		turnWifiOnLayout.setOnClickListener {
		wifiToggle.toggle()
		val isChecked = wifiToggle.isChecked
		handleWifiToggleClicked(isChecked)
		}
		@@ -376,8 +377,9 @@ constructor(
		internetDetailsContentController.connectCarrierNetwork()
		}

		// Mobile data toggle
		mobileDataToggle.setOnClickListener {
		// Mobile data toggle entry
		turnMobileOnLayout.setOnClickListener {
		mobileDataToggle.toggle()
		val isChecked = mobileDataToggle.isChecked
		if (!isChecked && shouldShowMobileDialog()) {
		mobileDataToggle.isChecked = true
		@@ -885,8 +887,8 @@ constructor(
		connectedWifiListLayout.setOnClickListener(null)
		secondaryMobileNetworkLayout?.setOnClickListener(null)
		seeAllLayout.setOnClickListener(null)
		wifiToggle.setOnCheckedChangeListener(null)
		mobileDataToggle.setOnCheckedChangeListener(null)
		turnWifiOnLayout.setOnClickListener(null)
		turnMobileOnLayout.setOnClickListener(null)
		shareWifiButton.setOnClickListener(null)
		addNetworkButton.setOnClickListener(null)
		airplaneModeButton.setOnClickListener(null)