Merge "Fix for the lock icon issue" into main (b22a8283) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt

+8 −4

Original line number	Diff line number	Diff line
		@@ -187,10 +187,6 @@ object DeviceEntryIconViewBinder {
		launch("$TAG#fpIconView.viewModel") {
		fgViewModel.viewModel.collect { viewModel ->
		Log.d(TAG, "Updating device entry icon image state $viewModel")
		fgIconView.setImageState(
		view.getIconState(viewModel.type, viewModel.useAodVariant),
		/* merge */ false,
		)
		if (viewModel.type.contentDescriptionResId != -1) {
		fgIconView.contentDescription =
		fgIconView.resources.getString(
		@@ -205,6 +201,14 @@ object DeviceEntryIconViewBinder {
		viewModel.padding,
		viewModel.padding,
		)
		// Set image state at the end after updating other view state. This
		// method forces the ImageView to recompute the bounds of the drawable.
		fgIconView.setImageState(
		view.getIconState(viewModel.type, viewModel.useAodVariant),
		/* merge */ false,
		)
		// Invalidate, just in case the padding changes just after icon changes
		fgIconView.invalidate()
		}
		}
		}