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
diff --git a/src/com/android/launcher3/apppairs/AppPairIcon.java b/src/com/android/launcher3/apppairs/AppPairIcon.java
index 12fc298..a7ceae8 100644
--- a/src/com/android/launcher3/apppairs/AppPairIcon.java
+++ b/src/com/android/launcher3/apppairs/AppPairIcon.java
@@ -97,12 +97,12 @@
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 =