Commit d085f5d0 authored May 16, 2023 by Automerger Merge Worker

Merge "Merge "Hide contaminant dialog "Enable USB" button if not supported"...

Merge "Merge "Hide contaminant dialog "Enable USB" button if not supported" am: f0937e77 am: e2be488e am: 87ecd2ec am: d6f466e3" into udc-d1-dev-plus-aosp am: c46a0472

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115033

Change-Id: I4e790b24bd9a3d142ee2300a0828ffb5f3ffa78b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SystemUI/src/com/android/systemui/usb/UsbContaminantActivity.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,12 @@ public class UsbContaminantActivity extends Activity implements View.OnClickList
		mLearnMore.setVisibility(View.VISIBLE);
		}

		if (!mUsbPort.supportsEnableContaminantPresenceDetection()) {
		mEnableUsb.setVisibility(View.GONE);
		} else {
		mEnableUsb.setOnClickListener(this);
		}

		mGotIt.setOnClickListener(this);
		mLearnMore.setOnClickListener(this);
		}