diff options
| author | Danesh Mondegarian <daneshm90@gmail.com> | 2013-09-10 06:14:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-09-10 06:14:16 +0000 |
| commit | 1b2a90776d8414d236bda2ecdf94ff8f58217313 (patch) | |
| tree | ccec2777c71ddb5ced1919044956eaf15acb74c7 /AndroidManifest.xml | |
| parent | 0e0db4378ce5f40b931be9368a7a56d6109f47df (diff) | |
| parent | e576f6e7887b063d1b6d9a2052eedd4cc7c014ee (diff) | |
| download | android_packages_apps_Trebuchet-1b2a90776d8414d236bda2ecdf94ff8f58217313.tar.gz android_packages_apps_Trebuchet-1b2a90776d8414d236bda2ecdf94ff8f58217313.tar.bz2 android_packages_apps_Trebuchet-1b2a90776d8414d236bda2ecdf94ff8f58217313.zip | |
Merge "Trebuchet : Support for custom icons per shortcut" into cm-10.2
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index cd790fea1..d10cd801d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -132,6 +132,12 @@ <activity android:name="com.cyanogenmod.trebuchet.preference.HiddenAppsActivity" android:label="@string/hidden_apps_title" /> + <activity android:name=".IconPickerActivity" + android:exported="false" + android:excludeFromRecents="true" + android:noHistory="true" + android:launchMode="singleTop" /> + <!-- Intent received used to install shortcuts from other applications --> <receiver android:name="com.cyanogenmod.trebuchet.InstallShortcutReceiver" |