Revert "update lockscreen background fix settings crash"

This reverts commit 59436d9dcba042190344009a3fb7bfccb73eeb16.

Conflicts:
	res/values/resurrection_arrays.xml
	res/values/resurrection_strings.xml
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Revert "Lockscreen background style 2 of 2"

This reverts commit 0650ab27a2202c29563048954d5fa862d4da8bcd.

Conflicts:
	res/values/resurrection_arrays.xml
	res/values/resurrection_strings.xml
Settings: Lockscreen custom wallpaper (2/2)

Change-Id: I1ac1351e9a31a5827847e30113e933f2b7da219f

Conflicts:
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Settings: lockscreen wallpaper crash fix

If a user backs out fast enough after setting a
custom wallpaper, the fragment becomes detached
from the activity, so any calls to getActivity()
were throwing exceptions.

The solution is to use the application Context
for toassts to still inform the user of the
status, and not update any UI elements
after the fragment is no longer attached.

Change-Id: Ia9f61184fb484d3af25565bc3c56e8b7b63ff4eb
Signed-off-by: Roman Birg <roman@cyngn.com>
(cherry picked from commit 67b8c1cc419fc82be662e8c72f24d281cbc8a5b3)
Settings: move keyguard wallpaper to system (2/2)

Change-Id: Id3bb66aa78c2e3dbd1170e74e33fcd160e5a70bb
Signed-off-by: Roman Birg <roman@cyngn.com>

Conflicts:
	res/xml/theme_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Add wallpaper pickers to seperate package [2/2]

Change-Id: I233b90aa52b5a8c408fa3adfe3bdad07330cc2ad
Lockscreen Background: Rework [2/2]