commit 0707f2c702761ebff4d13ab19e550e92c9f49151
author thiruram <thiruram@google.com> Thu Apr 30 14:58:29 2020 -0700
committer thiruram <thiruram@google.com> Thu Apr 30 15:03:43 2020 -0700
tree 39bdc4b2057f667e468572d28294992ad8c8ca86
parent f81e8b002a4e7242795718b5fc6061173e98af33

Fixes missing components info when logging Widget item.

Sample Log:

LAUNCHER_ITEM_DRAG_STARTED
    # com.android.launcher3.logger.LauncherAtom$ItemInfo@5c06a6d1
    container_info {
      workspace {
        grid_x: 3
        grid_y: 3
        page_index: 3
      }
    }
    is_work: false
    widget {
      component_name: "com.google.android.deskclock/com.android.alarmclock.DigitalAppWidgetProvider"
      package_name: "com.google.android.deskclock"
      span_x: 2
      span_y: 1
    }

Change-Id: I3d468c77632c694454fcdca24f9d2ccd1c4f918c

src/com/android/launcher3/model/data/ItemInfo.java

diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java
index 14f9934..561b4ed 100644
--- a/src/com/android/launcher3/model/data/ItemInfo.java
+++ b/src/com/android/launcher3/model/data/ItemInfo.java
@@ -272,7 +272,14 @@
                                 .orElse(LauncherAtom.Shortcut.newBuilder()));
                 break;
             case ITEM_TYPE_APPWIDGET:
-                setItemBuilder(itemBuilder);
+                itemBuilder
+                        .setWidget(nullableComponent
+                                .map(component -> LauncherAtom.Widget.newBuilder()
+                                        .setComponentName(component.flattenToShortString())
+                                        .setPackageName(component.getPackageName()))
+                                .orElse(LauncherAtom.Widget.newBuilder())
+                                .setSpanX(spanX)
+                                .setSpanY(spanY));
                 break;
             default:
                 break;

src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java

diff --git a/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java b/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java
index adb97dc..b0d19a6 100644
--- a/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java
+++ b/src/com/android/launcher3/model/data/LauncherAppWidgetInfo.java
@@ -21,6 +21,8 @@
 import android.content.Intent;
 import android.os.Process;
 
+import androidx.annotation.Nullable;
+
 import com.android.launcher3.AppWidgetResizeFrame;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherSettings;
@@ -142,6 +144,12 @@
         return appWidgetId <= CUSTOM_WIDGET_ID;
     }
 
+    @Nullable
+    @Override
+    public ComponentName getTargetComponent() {
+        return providerName;
+    }
+
     @Override
     public void onAddToDatabase(ContentWriter writer) {
         super.onAddToDatabase(writer);