From cc54eb490772044eb348f1f659d2b7e031a4e35f Mon Sep 17 00:00:00 2001
From: helencheuk <helencheuk@google.com>
Date: Fri, 26 Apr 2024 16:06:02 +0100
Subject: [PATCH] Add focus outline to AppPairIcon

Bug: 327470960
Test: Manual
Flag: ACONFIG com.android.launcher3.enable_focus_outline Trunkfood
Change-Id: I6a9c6abc3441b5f40bb4f352a844cecad4a1474b
---
 src/com/android/launcher3/apppairs/AppPairIcon.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/com/android/launcher3/apppairs/AppPairIcon.java b/src/com/android/launcher3/apppairs/AppPairIcon.java
index 1f73241ed0..32445ecddb 100644
--- a/src/com/android/launcher3/apppairs/AppPairIcon.java
+++ b/src/com/android/launcher3/apppairs/AppPairIcon.java
@@ -30,6 +30,8 @@ import androidx.annotation.Nullable;
 
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Flags;
+import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.Reorderable;
@@ -85,6 +87,11 @@ public class AppPairIcon extends FrameLayout implements DraggableView, Reorderab
                 : activity.getLayoutInflater();
         AppPairIcon icon = (AppPairIcon) inflater.inflate(resId, group, false);
 
+        if (Flags.enableFocusOutline() && activity instanceof Launcher) {
+            icon.setOnFocusChangeListener(((Launcher) activity).getFocusHandler());
+            icon.setDefaultFocusHighlightEnabled(false);
+        }
+
         // Sort contents, so that left-hand app comes first
         appPairInfo.getContents().sort(Comparator.comparingInt(a -> a.rank));