Merge "Hide contaminant dialog "Enable USB" button if not supported" am: f0937e7795
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115033 Change-Id: Ie13974366f66e24846fe7b2abb48d30c737b5381 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -75,7 +75,12 @@ public class UsbContaminantActivity extends Activity implements View.OnClickList
|
|||||||
mLearnMore.setVisibility(View.VISIBLE);
|
mLearnMore.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!mUsbPort.supportsEnableContaminantPresenceDetection()) {
|
||||||
|
mEnableUsb.setVisibility(View.GONE);
|
||||||
|
} else {
|
||||||
mEnableUsb.setOnClickListener(this);
|
mEnableUsb.setOnClickListener(this);
|
||||||
|
}
|
||||||
|
|
||||||
mGotIt.setOnClickListener(this);
|
mGotIt.setOnClickListener(this);
|
||||||
mLearnMore.setOnClickListener(this);
|
mLearnMore.setOnClickListener(this);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user