Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddc5d677 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Automerger Merge Worker
Browse files

Merge "Address AppEventProducer to correctly send search-result location on... 

Merge "Address AppEventProducer to correctly send search-result location on AppTargetEvent" into sc-v2-dev am: 664f6853

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16235837

Change-Id: I97061c17fc38c28d361499ed1557745cf1660908
parents ab8760e9 664f6853

quickstep/src/com/android/launcher3/model/AppEventProducer.java

+10 −3
Original line number Diff line number Diff line
@@ -271,9 +271,6 @@ public class AppEventProducer implements StatsLogConsumer { 
            case ALL_APPS_CONTAINER: {

                return "all-apps";

            }

            case SEARCH_RESULT_CONTAINER: {

                return "search-results";

            }

            case PREDICTED_HOTSEAT_CONTAINER: {

                return "predictions/hotseat";

            }
@@ -293,6 +290,16 @@ public class AppEventProducer implements StatsLogConsumer { 
                }

                return "folder";

            }

            case SEARCH_RESULT_CONTAINER:

                return "search-results";

            case EXTENDED_CONTAINERS: {

                switch(ci.getExtendedContainers().getContainerCase()) {

                    case DEVICE_SEARCH_RESULT_CONTAINER:

                    case CORRECTED_DEVICE_SEARCH_RESULT_CONTAINER:

                        return "search-results";

                }

            }

            default: // fall out

        }

        return "";

    }

quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java

+2 −0
Original line number Diff line number Diff line
@@ -329,6 +329,8 @@ public class QuickstepModelDelegate extends ModelDelegate { 
        }

        if (state.predictor != null) {

            state.predictor.notifyAppTargetEvent(event);

            Log.d(TAG, "notifyAppTargetEvent action=" + event.getAction()

                    + " launchLocation=" + event.getLaunchLocation());

        }

    }