diff options
| author | DvTonder <david.vantonder@gmail.com> | 2012-12-02 19:17:32 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-12-09 06:54:19 -0800 |
| commit | 46eda4b7d523aeb4371fca3a5a9084df64254d81 (patch) | |
| tree | fe23610a15dd2d26ae281559d83201ca7b44f9f2 /AndroidManifest.xml | |
| parent | 4a2138bae7bb7ce556d17f3e920b5c50e525648f (diff) | |
| download | packages_apps_settings-46eda4b7d523aeb4371fca3a5a9084df64254d81.zip packages_apps_settings-46eda4b7d523aeb4371fca3a5a9084df64254d81.tar.gz packages_apps_settings-46eda4b7d523aeb4371fca3a5a9084df64254d81.tar.bz2 | |
Settings: Forward port Slider shortcuts
Includes Change I683d9c22: Add the new lockscreen drawables to the
picker list by Bjorn Lunden (blunden)
Settings : Lockscreen targets alignment fix
Add separate layouts for different layouts to fix alignment issues.
Change-Id: I2453225e8a683244a1e11f0a8d3c18954ba5885f
Change-Id: I155824abc0578d98d3e2f1f5c2dcde3fa7b2ef84
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index adbd457..b22c96b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1200,7 +1200,7 @@ <activity android:name="ActivityPicker" android:label="@string/activity_picker_label" - android:theme="@*android:style/Theme.Dialog.Alert" + android:theme="@*android:style/Theme.Holo.Dialog.Alert" android:finishOnCloseSystemDialogs="true"> <intent-filter> <action android:name="android.intent.action.PICK_ACTIVITY" /> @@ -1477,6 +1477,10 @@ <activity android:name=".profiles.NFCProfileSelect" /> + <activity android:name=".cyanogenmod.LockscreenTargets" /> + + <activity android:name=".cyanogenmod.LockscreenInterface" /> + <activity android:name=".cyanogenmod.PowerMenu" /> <activity android:name=".profiles.NFCProfile" |