From 95179cffab81e33b965638f147f9cafb0ed8ae50 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 5 Apr 2024 18:49:52 +0000 Subject: [PATCH] Fix regression in checking disabled state - It should only check the disabled state after the icon graphic has been set Fixes: 333017803 Test: Load with an app pair icon on the workspace Change-Id: Ic313f98e1e31d673d774f050bb418d359b4bd653 Merged-In: I7242e0c525ef578a54a06fb9137fcfc42c6f0e86 --- src/com/android/launcher3/apppairs/AppPairIcon.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/apppairs/AppPairIcon.java b/src/com/android/launcher3/apppairs/AppPairIcon.java index 12fc298408..a7ceae85ea 100644 --- a/src/com/android/launcher3/apppairs/AppPairIcon.java +++ b/src/com/android/launcher3/apppairs/AppPairIcon.java @@ -97,12 +97,12 @@ public class AppPairIcon extends FrameLayout implements DraggableView, Reorderab icon.mInfo = appPairInfo; icon.mContainer = container; - icon.checkDisabledState(); - // Set up icon drawable area icon.mIconGraphic = icon.findViewById(R.id.app_pair_icon_graphic); icon.mIconGraphic.init(icon, container); + icon.checkDisabledState(); + // Set up app pair title icon.mAppPairName = icon.findViewById(R.id.app_pair_icon_name); FrameLayout.LayoutParams lp =