rename the custom lockscreen state action
Add wallpaper pickers to seperate package [1/2]

Currently wallpaper pickers were part of the various launchers
and we were relying on Trebuchet's to add code for including
wallpapers from themes.  If Trebuchet is removed then this
functionality is lost.  This package is already included in all
builds so making the picker available here removes the dependency
on a specific launcher.

Trebuchet still contains a picker which should probably be removed
and make use of this package instead.

Change-Id: Ie42ae0e01f951a8293d13d6c8a73fde0dea6682b

Conflicts:
	packages/WallpaperCropper/AndroidManifest.xml
	packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java
fix conflicts
Revert "fix conflicts"

This reverts commit f181360dd338dc2d926d3eeb66a6293b37f6143d.
Revert "Add wallpaper pickers to seperate package [1/2]"

This reverts commit f08adef1d5c01769bff207e27072d1e0b470e8ee.
Add AutoRotate and music as Default tile
Frameworks/base: Second Clock (1/2)
fix systemui fc while changing slim recents to left
AudioService: fix safe volume enforced even when disabled

On onConfigureSafeVolume, the proper API was not used, leading
to the setting not being respected. Sometimes after boot, the
heaadset volume will be set back to the safe volume.

Change-Id: I5ba8bb1a18ce97ed64646663c7e75cb277356778
Set ActionMode title to the number of selected files

After change of orientation ActionMode is recreated without previously
set title. It needs to be updated in onCreateActionMode callback.

Change-Id: If5f36e8ad6d1b5cf04ed242611fd037969d73517
Revert "telephony: set additional audioparameters for incall audio (1/2)"

Part 2/2 was never merged and is not needed.

This reverts commit 129d5a726b9c81190450f6b242e53f794c2711db.

Change-Id: If0417a66c3a5a78e4f7b4ba6d1d543f56648e442
CamcorderProfile: Add 4k timelapse encoder constants

 4k encoder constants during timelapse are added
 for the 4k timelapse use case.

CRs-Fixed: 642013
Change-Id: I901fa362242477dad84130d23055815cdfee6167
Avoid SystemUI crash due to NPE

BaseStatusBar.createNotificationViews() returns null
when it reports handleNotificationError(), leading to
a forced crash of the misbehaving app. However, it
should not add a null object of Notification.Entry
since it will also crash SystemUI (crashing at compare).

Change-Id: I86678c8024e931420b0fbab1f36b330e7e75d581
Merge pull request #5 from NoelMacwan/kitkat1

fix systemui fc while changing slim recents to left
Revert "Lockscreen background style 1 of 2"

This reverts commit beeded6f5bf1cd78c0a0f0ae4365716bd77adc76.

Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
Frameworks: Lockscreen custom wallpaper (1/2)

kitkat now has code for a custom wallpaper image.

Using that code set a switch case to set the custom background between
  - Custom Wallpaper
  - Default background

This way allows the same overlay shadow thats set on the keyguard when
its the defualt way.

Change-Id: I98fde63ef9f3c0a5f334cd9a97b237a6f99c57f6

Conflicts:
	core/java/android/provider/Settings.java
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
Lockscreen: Fix SystemUI crash on initial selection of Custom Background.

Change-Id: I8df4984f4b90d211baa888d380a95fc00a85d1ad

Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
Keyguard: more consistency with the new lockscreen wallpaper

* In the case when the screen was off and setCustomDrawable()
was being called, and the use wallpaper is null, then we could be
setting the color filter on a null drawable.

* Fix logic when old custom background was null and the new one is also
null (but could be the user one) and the func was being returned, thus not
clearing out the current media album art.

* Move resetting the shouldShowWallpaper() flag to the show() method
so it is not being called every time the screen is turned on.

* Fix user image not showing up on first boot if it exists

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

Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
Lockscreen wallpaper for themes

Change-Id: If77b97301c5bfebd94b193fe9a54e676e678d3ed
frameworks: move keyguard wallpaper to system  (1/2)

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

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/cm_strings.xml