From 3e244cf9d2da4fb04ef095f8b752a2a2c6e2f287 Mon Sep 17 00:00:00 2001 From: Bjorn Bringert Date: Wed, 10 Feb 2010 14:17:35 +0000 Subject: Use Search.SOURCE from android-common The SOURCE (search source identifier) constant is moving from hidden in android.app.SearchManager to com.android.common.Search. Part of http://b/issue?id=2429556 Change-Id: I68fa792f2d452aadcb9216f5c780bd082ca5039f --- Android.mk | 2 ++ src/com/android/launcher2/Launcher.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index 00a8977a4..9c2a800eb 100644 --- a/Android.mk +++ b/Android.mk @@ -19,6 +19,8 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional +LOCAL_STATIC_JAVA_LIBRARIES := android-common + LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := Launcher2 diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 99b1b6c84..646203c8c 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -16,6 +16,8 @@ package com.android.launcher2; +import com.android.common.Search; + import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -963,7 +965,7 @@ public final class Launcher extends Activity } if (appSearchData == null) { appSearchData = new Bundle(); - appSearchData.putString(SearchManager.SOURCE, "launcher-search"); + appSearchData.putString(Search.SOURCE, "launcher-search"); } final SearchManager searchManager = -- cgit v1.2.3