[1/2] settings: Enable quick unlock

Conflicts:
	res/values/mahdi_strings.xml
	src/com/android/settings/SecuritySettings.java

Conflicts:
	res/values/ras_strings.xml
	src/com/android/settings/SecuritySettings.java
Add native java screen recorder [2/2]

PS2:
Change framerate related stuff to bitrate since the setting
is actually the bitrate and not the frame rate ;)

Change-Id: I416a3c80eb4ba892497ce46afea979290d0460af

Conflicts:
	res/values/vendor_arrays.xml
	res/values/vendor_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/SecuritySettings.java
Screen recorder: add ability to record audio from mic [2/3]

Change-Id: Id64bdc332505a7c7d9bafe76c78032d24630062e

Conflicts:
	res/values/vendor_strings.xml
Fix the icon size in app lists.

E.g. the "Select app" dialog in the profile group configuration uses
this layout to inflate the list dialog. However app icons can have
non-standard sizes so we enforce a consistent width and height.

Change-Id: I71731a9bb3548c699cc2e0e600a5ff371ceacbc3
Bleed keyguard widget picker list into translucent bars
Merge branch 'kk' of SimpleAOSP into kk