summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-09-19 19:57:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-19 19:57:35 +0000
commit06f4dc5dfcaa1fd11a7be387d6b233a61a4a55fe (patch)
tree93f2e0952d78138f420bb5b2c1c7a5ae1ef60b53
parentcb0ec764daa41302cbd2a5bac038ac33d9fc6866 (diff)
parent7e053f8784c886359f911161db5fd8b61333450d (diff)
downloadandroid_packages_apps_Trebuchet-06f4dc5dfcaa1fd11a7be387d6b233a61a4a55fe.tar.gz
android_packages_apps_Trebuchet-06f4dc5dfcaa1fd11a7be387d6b233a61a4a55fe.tar.bz2
android_packages_apps_Trebuchet-06f4dc5dfcaa1fd11a7be387d6b233a61a4a55fe.zip
am 7e053f87: Merge "Changing intent action for auto installs" into ub-now-porkchop
* commit '7e053f8784c886359f911161db5fd8b61333450d': Changing intent action for auto installs
-rw-r--r--src/com/android/launcher3/AutoInstallsLayout.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/AutoInstallsLayout.java b/src/com/android/launcher3/AutoInstallsLayout.java
index 931501c6a..00f0cf36f 100644
--- a/src/com/android/launcher3/AutoInstallsLayout.java
+++ b/src/com/android/launcher3/AutoInstallsLayout.java
@@ -57,7 +57,7 @@ public class AutoInstallsLayout implements WorkspaceLoader {
/** Marker action used to discover a package which defines launcher customization */
static final String ACTION_LAUNCHER_CUSTOMIZATION =
- "com.android.launcher3.action.LAUNCHER_CUSTOMIZATION";
+ "android.autoinstalls.config.action.PLAY_AUTO_INSTALL";
private static final String LAYOUT_RES = "default_layout";