summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornebkat <nebkat@teamhacksung.org>2012-05-14 06:58:24 (GMT)
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-05-14 06:58:24 (GMT)
commitf19bb4946d4ca6d39df7566ff280d24ac08db1ea (patch)
tree0cb797c1c8ecb68730db40f403a53aa0e2d92d25
parent6cdf2b775ecf4bcaf268bf39f1b8f200b9d96084 (diff)
parenta05ea0305ded4c095dbea8be9d6184d82120b082 (diff)
downloadandroid_packages_apps_Trebuchet-f19bb4946d4ca6d39df7566ff280d24ac08db1ea.zip
android_packages_apps_Trebuchet-f19bb4946d4ca6d39df7566ff280d24ac08db1ea.tar.gz
android_packages_apps_Trebuchet-f19bb4946d4ca6d39df7566ff280d24ac08db1ea.tar.bz2
Merge "CM Preferences Category" into ics
-rw-r--r--AndroidManifest.xml8
1 files changed, 6 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ad5bdad..7553b62 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -105,8 +105,12 @@
</activity>
<activity android:name="com.cyanogenmod.trebuchet.preference.Preferences"
- android:label="@string/preferences_title" />
-
+ android:label="@string/preferences_title">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="com.cyanogenmod.category.LAUNCHER_PREFERENCES" />
+ </intent-filter>
+ </activity>
<!-- Intent received used to install shortcuts from other applications -->
<receiver
android:name="com.cyanogenmod.trebuchet.InstallShortcutReceiver"