commit e6843777b03d3e18326fd9ce2b775a006fab72b3
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 01 23:08:00 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 01 23:08:00 2020 +0000
tree c73948f195438939c83a4fe2af2a9d9da537b390
parent 122d2d9dbbd4fdf086b722a162b0a797ba0c1305
parent 7874996823f85678d0a13eff12a32dff3798d00c

Merge "[AllAppsSearch] Update AllAppsSearch interface to expose the activity to the plugin" into ub-launcher3-rvc-dev

src/com/android/launcher3/allapps/AllAppsTransitionController.java

diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index ab556f2..74e178f 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -281,7 +281,7 @@
                 R.layout.all_apps_content_layout, mAppsView, false);
         mAppsView.addView(mPluginContent);
         mPluginContent.setAlpha(0f);
-        mPlugin.setup((ViewGroup) mPluginContent);
+        mPlugin.setup((ViewGroup) mPluginContent, mLauncher);
     }
 
     @Override

src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java

diff --git a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
index b865a20..cdd3b06 100644
--- a/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
+++ b/src_plugins/com/android/systemui/plugins/AllAppsSearchPlugin.java
@@ -16,6 +16,7 @@
 
 package com.android.systemui.plugins;
 
+import android.app.Activity;
 import android.view.ViewGroup;
 import android.widget.EditText;
 
@@ -27,8 +28,8 @@
 @ProvidesInterface(action = AllAppsSearchPlugin.ACTION, version = AllAppsSearchPlugin.VERSION)
 public interface AllAppsSearchPlugin extends Plugin {
     String ACTION = "com.android.systemui.action.PLUGIN_ALL_APPS_SEARCH_ACTIONS";
-    int VERSION = 1;
+    int VERSION = 2;
 
-    void setup(ViewGroup parent);
+    void setup(ViewGroup parent, Activity activity);
     void setEditText(EditText editText);
 }