diff options
| author | Flamefire <alex@grundis.de> | 2014-04-01 11:40:55 +0200 |
|---|---|---|
| committer | Flamefire <alex@grundis.de> | 2014-04-22 19:40:20 +0200 |
| commit | 6a43e660cce2cda206f4fecf3ed4ecf9dce8f326 (patch) | |
| tree | 49ec4b23b7065fa18aa730a38afb952b8f13fe71 /AndroidManifest.xml | |
| parent | 16310323d9c820ae98691fc5f0c459cb18524ca6 (diff) | |
| download | android_packages_apps_Trebuchet-6a43e660cce2cda206f4fecf3ed4ecf9dce8f326.tar.gz android_packages_apps_Trebuchet-6a43e660cce2cda206f4fecf3ed4ecf9dce8f326.tar.bz2 android_packages_apps_Trebuchet-6a43e660cce2cda206f4fecf3ed4ecf9dce8f326.zip | |
Re-Add hidden-apps setting
Forward port from CM 10.2
PS3: Don't rename and incorporate changes from Devkota
PS4: Update German translation
PS5: Remove translations
PS7: Hide widgets from widget list
PS9: Remove debug output
PS11: Rebase
Change-Id: Ie06b288e22c2678fb09da1bf42d46922b8319e01
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f33bb0b30..f8ef64f31 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -85,7 +85,7 @@ </intent-filter> </activity> - <activity android:name="com.android.launcher3.settings.SettingsActivity" + <activity android:name=".settings.SettingsActivity" android:label="@string/preferences_title"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -95,6 +95,16 @@ </activity> <activity + android:name=".settings.HiddenAppsActivity" + android:label="@string/hidden_apps_title" + android:exported="false"> + <intent-filter> + <action android:name=".settings.HiddenAppsActivity" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + + <activity android:name="com.android.launcher3.ToggleWeightWatcher" android:label="@string/toggle_weight_watcher" android:enabled="@bool/debug_memory_enabled" |