summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2015-10-16 20:43:32 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-16 20:43:32 +0000
commit8385e7188d66f632ac471ce3750bae3c199740bc (patch)
tree0e91b361e6806ddea41a145f8ff000f5dd0a8475 /src
parent041434fb59edbf72db83dfd3e46816df03d0377d (diff)
parentf79d347a615023d9db721e6483d08033aaabd575 (diff)
downloadandroid_packages_apps_Trebuchet-8385e7188d66f632ac471ce3750bae3c199740bc.tar.gz
android_packages_apps_Trebuchet-8385e7188d66f632ac471ce3750bae3c199740bc.tar.bz2
android_packages_apps_Trebuchet-8385e7188d66f632ac471ce3750bae3c199740bc.zip
Add LauncherCallbacks method to add additional search widget options. am: 775455c4a8
am: f79d347a61 * commit 'f79d347a615023d9db721e6483d08033aaabd575': Add LauncherCallbacks method to add additional search widget options.
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Launcher.java4
-rw-r--r--src/com/android/launcher3/LauncherCallbacks.java1
-rw-r--r--src/com/android/launcher3/testing/LauncherExtension.java5
3 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 51d075fae..fd208dba9 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3592,6 +3592,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 927db224f..f27ed1da9 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 8055b5fce..89821768c 100644
--- a/src/com/android/launcher3/testing/LauncherExtension.java
+++ b/src/com/android/launcher3/testing/LauncherExtension.java
@@ -253,6 +253,11 @@ public class LauncherExtension extends Launcher {
}
@Override
+ public Bundle getAdditionalSearchWidgetOptions() {
+ return new Bundle();
+ }
+
+ @Override
public Intent getFirstRunActivity() {
return null;
}