From 775455c4a8266655bf43b943e969d42ac32609ec Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 16 Oct 2015 09:49:32 -0700
Subject: [PATCH] Add LauncherCallbacks method to add additional search widget
 options.

Bug: 25000458
Change-Id: I5e8d48617568569bc6e4f284749c3ed9fb20a68f
---
 src/com/android/launcher3/Launcher.java                  | 4 ++++
 src/com/android/launcher3/LauncherCallbacks.java         | 1 +
 src/com/android/launcher3/testing/LauncherExtension.java | 5 +++++
 3 files changed, 10 insertions(+)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 3b1ee2abb1..9c321a81a6 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3553,6 +3553,10 @@ public class Launcher extends Activity
             opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, maxWidth);
             opts.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, minWidth);
 
+            if (mLauncherCallbacks != null) {
+                opts.putAll(mLauncherCallbacks.getAdditionalSearchWidgetOptions());
+            }
+
             SharedPreferences sp = getSharedPreferences(
                     LauncherAppState.getSharedPreferencesKey(), MODE_PRIVATE);
             int widgetId = sp.getInt(QSB_WIDGET_ID, -1);
diff --git a/src/com/android/launcher3/LauncherCallbacks.java b/src/com/android/launcher3/LauncherCallbacks.java
index 927db224f8..f27ed1da9e 100644
--- a/src/com/android/launcher3/LauncherCallbacks.java
+++ b/src/com/android/launcher3/LauncherCallbacks.java
@@ -83,6 +83,7 @@ public interface LauncherCallbacks {
     public boolean hasCustomContentToLeft();
     public void populateCustomContentContainer();
     public View getQsbBar();
+    public Bundle getAdditionalSearchWidgetOptions();
 
     /*
      * Extensions points for adding / replacing some other aspects of the Launcher experience.
diff --git a/src/com/android/launcher3/testing/LauncherExtension.java b/src/com/android/launcher3/testing/LauncherExtension.java
index 3364fcc9f5..1bb57874e3 100644
--- a/src/com/android/launcher3/testing/LauncherExtension.java
+++ b/src/com/android/launcher3/testing/LauncherExtension.java
@@ -252,6 +252,11 @@ public class LauncherExtension extends Launcher {
             return mLauncherOverlay.getSearchBox();
         }
 
+        @Override
+        public Bundle getAdditionalSearchWidgetOptions() {
+            return new Bundle();
+        }
+
         @Override
         public Intent getFirstRunActivity() {
             return null;