summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2015-07-02 20:11:31 (GMT)
committerStephen Bird <sbird@cyngn.com>2015-07-28 17:32:43 (GMT)
commitfd93bd7bc97d9ba9ebf9cd01a385ffc60e596e77 (patch)
tree296dd98c4c861bd564baf2696890c1314b152e55
parentbb1982eaad9e677cc5abe0464e515d9cba77fb89 (diff)
downloadandroid_packages_apps_Trebuchet-caf/cm-12.0.zip
android_packages_apps_Trebuchet-caf/cm-12.0.tar.gz
android_packages_apps_Trebuchet-caf/cm-12.0.tar.bz2
Trebuchet: display search widget search box if availablecaf/cm-12.0
Ported to CAF Conflicts: src/com/android/launcher3/Launcher.java Change-Id: I3a6d930f25ca4ac1eb8a069c68a2fe9bf2aeb646 Signed-off-by: Roman Birg <roman@cyngn.com> (cherry picked from commit cfe3474f48fc2255bfe0135648c48afc594462c8)
-rw-r--r--src/com/android/launcher3/DeviceProfile.java10
-rw-r--r--src/com/android/launcher3/Launcher.java136
2 files changed, 129 insertions, 17 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 9bdfcf4..a052fe6 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -588,7 +588,7 @@ public class DeviceProfile {
if (isTablet() && !isVerticalBarLayout()) {
return searchBarVisible ? 4 * edgeMarginPx : 0;
} else {
- return searchBarVisible ? 2 * edgeMarginPx : 0;
+ return searchBarVisible ? edgeMarginPx : 0;
}
}
@@ -811,9 +811,13 @@ public class DeviceProfile {
lp.width = searchBarSpaceWidthPx;
lp.height = searchBarSpaceHeightPx;
searchBar.setPadding(
- 2 * edgeMarginPx,
+ edgeMarginPx,
getSearchBarTopOffset(),
- 2 * edgeMarginPx, 0);
+ edgeMarginPx, edgeMarginPx);
+ }
+ if (launcher.mSearchWidgetId >= 0) {
+ // remove padding on widget
+ searchBar.setPadding(0, 0, 0, 0);
}
searchBar.setLayoutParams(lp);
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index a5e7248..30c9dee 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -33,6 +33,7 @@ import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.app.Dialog;
import android.app.SearchManager;
+import android.appwidget.AppWidgetHost;
import android.appwidget.AppWidgetHostView;
import android.appwidget.AppWidgetManager;
import android.appwidget.AppWidgetProviderInfo;
@@ -70,6 +71,7 @@ import android.os.Handler;
import android.os.Message;
import android.os.StrictMode;
import android.os.SystemClock;
+import android.os.UserHandle;
import android.speech.RecognizerIntent;
import android.text.Selection;
import android.text.SpannableStringBuilder;
@@ -77,6 +79,7 @@ import android.text.TextUtils;
import android.text.method.TextKeyListener;
import android.util.DisplayMetrics;
import android.util.Log;
+import android.util.Pair;
import android.view.ContextThemeWrapper;
import android.view.Display;
import android.view.Gravity;
@@ -390,6 +393,11 @@ public class Launcher extends Activity
private BubbleTextView mWaitingForResume;
+ // Search widget
+ int mSearchWidgetId;
+ AppWidgetProviderInfo mSearchWidgetInfo;
+ AppWidgetHostView mSearchViewHost;
+
// Preferences
private boolean mHideIconLabels;
@@ -625,19 +633,25 @@ public class Launcher extends Activity
private void updateGlobalIcons() {
boolean searchVisible = false;
boolean voiceVisible = false;
- // If we have a saved version of these external icons, we load them up immediately
- int coi = getCurrentOrientationIndexForGlobalIcons();
- if (sGlobalSearchIcon[coi] == null || sVoiceSearchIcon[coi] == null) {
- searchVisible = updateGlobalSearchIcon();
- voiceVisible = updateVoiceSearchIcon(searchVisible);
- }
- if (sGlobalSearchIcon[coi] != null) {
- updateGlobalSearchIcon(sGlobalSearchIcon[coi]);
- searchVisible = true;
- }
- if (sVoiceSearchIcon[coi] != null) {
- updateVoiceSearchIcon(sVoiceSearchIcon[coi]);
- voiceVisible = true;
+ if (mSearchWidgetId >= 0) {
+ // we're displaying a search widget
+ searchVisible = true;
+ voiceVisible = false;
+ } else {
+ // If we have a saved version of these external icons, we load them up immediately
+ int coi = getCurrentOrientationIndexForGlobalIcons();
+ if (sGlobalSearchIcon[coi] == null || sVoiceSearchIcon[coi] == null) {
+ searchVisible = updateGlobalSearchIcon();
+ voiceVisible = updateVoiceSearchIcon(searchVisible);
+ }
+ if (sGlobalSearchIcon[coi] != null) {
+ updateGlobalSearchIcon(sGlobalSearchIcon[coi]);
+ searchVisible = true;
+ }
+ if (sVoiceSearchIcon[coi] != null) {
+ updateVoiceSearchIcon(sVoiceSearchIcon[coi]);
+ voiceVisible = true;
+ }
}
if (mSearchDropTargetBar != null) {
mSearchDropTargetBar.onSearchPackagesChanged(searchVisible, voiceVisible);
@@ -4371,15 +4385,107 @@ public class Launcher extends Activity
}
}
+ /**
+ * Resolves and returns the first search widget from the same package as the global
+ * assist activity.
+ */
+ public AppWidgetProviderInfo resolveSearchAppWidget() {
+ if (mAppWidgetManager == null) return null;
+
+ SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
+ final Intent assistIntent = searchManager.getAssistIntent(this, false);
+ if (assistIntent == null) {
+ return null;
+ }
+ ComponentName searchComponent = assistIntent.getComponent();
+
+ // Find the first widget from the same package as the global assist activity
+ List<AppWidgetProviderInfo> widgets = AppWidgetManager.getInstance(this)
+ .getInstalledProviders(AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN);
+ for (AppWidgetProviderInfo info : widgets) {
+ if (info.provider.getPackageName().equals(searchComponent.getPackageName())) {
+ return info;
+ }
+ }
+ return null;
+ }
+
+ public Pair<Integer, AppWidgetProviderInfo> bindSearchAppWidget(AppWidgetHost host) {
+ if (mAppWidgetManager == null) return null;
+
+ if (!mGrid.isPhone()) {
+ // tablets rotate and widget doesn't have a vertical layout
+ return null;
+ }
+
+ // Find the first widget from the same package as the global assist activity
+ AppWidgetProviderInfo searchWidgetInfo = resolveSearchAppWidget();
+
+ // Return early if there is no search widget
+ if (searchWidgetInfo == null) return null;
+
+ // Allocate a new widget id and try and bind the app widget (if that fails, then just skip)
+ int searchWidgetId = host.allocateAppWidgetId();
+ Bundle opts = new Bundle();
+ opts.putInt(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY,
+ AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN);
+ if (!AppWidgetManager.getInstance(this).bindAppWidgetIdIfAllowed(searchWidgetId,
+ searchWidgetInfo.provider, opts)) {
+ host.deleteAppWidgetId(searchWidgetId);
+ return null;
+ }
+ return new Pair<Integer, AppWidgetProviderInfo>(searchWidgetId, searchWidgetInfo);
+ }
+
public View getQsbBar() {
if (mQsb == null) {
- mQsb = mInflater.inflate(R.layout.qsb, mSearchDropTargetBar, false);
+ // bind search widget if possible
+ if (mSearchWidgetId >= 0) {
+ mSearchWidgetInfo
+ = AppWidgetManager.getInstance(this).getAppWidgetInfo(mSearchWidgetId);
+ if (mSearchWidgetInfo == null) {
+ mAppWidgetHost.deleteAppWidgetId(mSearchWidgetId);
+ mSearchWidgetId = -1;
+ }
+ }
+
+ if (mSearchWidgetId < 0) {
+ final Pair<Integer, AppWidgetProviderInfo> newWidget
+ = bindSearchAppWidget(mAppWidgetHost);
+ if (newWidget != null) {
+ mSearchWidgetInfo = newWidget.second;
+ mSearchWidgetId = newWidget.first;
+ } else {
+ mSearchWidgetId = -1;
+ }
+ }
+
+ if (mSearchWidgetId < 0) {
+ // no widget, fall back to views
+ mQsb = mInflater.inflate(R.layout.qsb, mSearchDropTargetBar, false);
+ } else {
+ final AppWidgetHostView searchWidget
+ = mAppWidgetHost.createView(this, mSearchWidgetId, mSearchWidgetInfo);
+ searchWidget.setAppWidget(mSearchWidgetId, mSearchWidgetInfo);
+ searchWidget.setPadding(0, 0, 0, 0);
+
+ Bundle opts = new Bundle();
+ opts.putInt(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY,
+ AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN);
+ searchWidget.updateAppWidgetOptions(opts);
+ searchWidget.setVisibility(View.VISIBLE);
+
+ mQsb = searchWidget;
+ mSearchViewHost = searchWidget;
+ }
+
mSearchDropTargetBar.addView(mQsb);
}
return mQsb;
}
protected boolean updateGlobalSearchIcon() {
+ if (mSearchWidgetId >= 0) return false;
final View searchButtonContainer = findViewById(R.id.search_button_container);
final ImageView searchButton = (ImageView) findViewById(R.id.search_button);
final View voiceButtonContainer = findViewById(R.id.voice_button_container);
@@ -4416,6 +4522,7 @@ public class Launcher extends Activity
}
protected void updateGlobalSearchIcon(Drawable.ConstantState d) {
+ if (mSearchWidgetId >= 0) return;
final View searchButtonContainer = findViewById(R.id.search_button_container);
final View searchButton = (ImageView) findViewById(R.id.search_button);
updateButtonWithDrawable(R.id.search_button, d);
@@ -4423,6 +4530,7 @@ public class Launcher extends Activity
}
protected boolean updateVoiceSearchIcon(boolean searchVisible) {
+ if (mSearchWidgetId >= 0) return false;
final View voiceButtonContainer = findViewById(R.id.voice_button_container);
final View voiceButton = findViewById(R.id.voice_button);