summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Bringert <bringert@google.com>2013-06-06 21:54:20 +0100
committerBjorn Bringert <bringert@google.com>2013-06-06 21:55:35 +0100
commite441bbc7d2baee03e96897b80f55db5ce2aa7e1f (patch)
tree9e1bc61db9d84800429e07099952db09575e0995
parent42aa7b253890eed909bfffbc38468a28ff513fb3 (diff)
downloadandroid_packages_apps_Trebuchet-e441bbc7d2baee03e96897b80f55db5ce2aa7e1f.tar.gz
android_packages_apps_Trebuchet-e441bbc7d2baee03e96897b80f55db5ce2aa7e1f.tar.bz2
android_packages_apps_Trebuchet-e441bbc7d2baee03e96897b80f55db5ce2aa7e1f.zip
Use standard names for search / voice icon meta-data
These shouldn't be renamed to launcher3.*, since they are used to get icons from external search / voice apps. Change-Id: Iae10b9c19771133579a8f6f24ce9c0efbae82688
-rw-r--r--src/com/android/launcher3/Launcher.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0486b0073..a5a90d2c5 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -179,11 +179,11 @@ public final class Launcher extends Activity
// Type: parcelable
private static final String RUNTIME_STATE_PENDING_ADD_WIDGET_INFO = "launcher.add_widget_info";
- private static final String TOOLBAR_ICON_METADATA_NAME = "com.android.launcher3.toolbar_icon";
+ private static final String TOOLBAR_ICON_METADATA_NAME = "com.android.launcher.toolbar_icon";
private static final String TOOLBAR_SEARCH_ICON_METADATA_NAME =
- "com.android.launcher3.toolbar_search_icon";
+ "com.android.launcher.toolbar_search_icon";
private static final String TOOLBAR_VOICE_SEARCH_ICON_METADATA_NAME =
- "com.android.launcher3.toolbar_voice_search_icon";
+ "com.android.launcher.toolbar_voice_search_icon";
/** The different states that Launcher can be in. */
private enum State { NONE, WORKSPACE, APPS_CUSTOMIZE, APPS_CUSTOMIZE_SPRING_LOADED };