summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Bringert <bringert@google.com>2013-06-06 13:00:41 +0100
committerBjorn Bringert <bringert@google.com>2013-06-06 13:00:41 +0100
commit32b12d2c792b74f193547e4b8375c97240079be1 (patch)
tree106d920cf9508196a79589584fe6e3e37b843a7f
parentf3e92c94488bb35d49f9ffb0bfffc9ba26292c46 (diff)
downloadandroid_packages_apps_Trebuchet-32b12d2c792b74f193547e4b8375c97240079be1.tar.gz
android_packages_apps_Trebuchet-32b12d2c792b74f193547e4b8375c97240079be1.tar.bz2
android_packages_apps_Trebuchet-32b12d2c792b74f193547e4b8375c97240079be1.zip
Get rid of dependency on android-common
It was only used for a single string constant that can be inlined Change-Id: I19078b6b00adf1b91e329d10181e91809944b606
-rw-r--r--Android.mk2
-rw-r--r--src/com/android/launcher3/Launcher.java3
2 files changed, 2 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index a2e2f107a..016d151a9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := android-common android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
LOCAL_SDK_VERSION := 17
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 3f487cd21..0486b0073 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -94,7 +94,6 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
-import com.android.common.Search;
import com.android.launcher3.R;
import com.android.launcher3.DropTarget.DragObject;
@@ -1620,7 +1619,7 @@ public final class Launcher extends Activity
}
if (appSearchData == null) {
appSearchData = new Bundle();
- appSearchData.putString(Search.SOURCE, "launcher-search");
+ appSearchData.putString("source", "launcher-search");
}
Rect sourceBounds = new Rect();
if (mSearchDropTargetBar != null) {