1 files changed, 3 insertions, 7 deletions
diff --git a/java/src/com/android/intentresolver/icons/TargetDataLoader.kt b/java/src/com/android/intentresolver/icons/TargetDataLoader.kt
index 50f731f..07c6217 100644
--- a/java/src/com/android/intentresolver/icons/TargetDataLoader.kt
+++ b/java/src/com/android/intentresolver/icons/TargetDataLoader.kt
@@ -16,10 +16,8 @@
 
 package com.android.intentresolver.icons
 
-import android.content.pm.ResolveInfo
 import android.graphics.drawable.Drawable
 import android.os.UserHandle
-import com.android.intentresolver.TargetPresentationGetter
 import com.android.intentresolver.chooser.DisplayResolveInfo
 import com.android.intentresolver.chooser.SelectableTargetInfo
 import java.util.function.Consumer
@@ -41,10 +39,8 @@ abstract class TargetDataLoader {
     )
 
     /** Load target label */
-    abstract fun loadLabel(info: DisplayResolveInfo, callback: Consumer<Array<CharSequence?>>)
+    abstract fun loadLabel(info: DisplayResolveInfo, callback: Consumer<LabelInfo>)
 
-    /** Create a presentation getter to be used with a [DisplayResolveInfo] */
-    // TODO: get rid of DisplayResolveInfo's dependency on the presentation getter and remove this
-    //  method.
-    abstract fun createPresentationGetter(info: ResolveInfo): TargetPresentationGetter
+    /** Loads DisplayResolveInfo's display label synchronously, if needed */
+    abstract fun getOrLoadLabel(info: DisplayResolveInfo)
 }