Better Font Control

Conflicts:
	res/values-ru/slim_strings.xml
	res/values/slim_strings.xml

Conflicts:
	res/values-ru/slim_strings.xml
	res/values/attrs.xml
	res/values/slim_strings.xml
	src/com/android/settings/DisplaySettings.java
Settings: Lockscreen Shake Security && Timer (2/2)

Shake to temporarily enable security.
	On successful unlock, disable security

PS2: Derp
PS3: Merge timer setting:
	Secure lock will auto-engage after
		X minutes
	Disable if device admin requires
		security
PS4: User must now verify their current
	security method before the setting
	is enabled here.
PS5: Fix targets now showing up on insecure
	lockscreens.

Change-Id: I44c2b1ab841b2a6f0d7f637da837806ce4a9d03c

Conflicts:
	res/values/slim_arrays.xml
Update slim_arrays.xml
No more HEAD
Update slim_strings.xml
Update SecuritySettings.java
Update SecuritySettings.java
Update DevelopmentSettings.java
app circle
Merge branch 'staging' of https://github.com/ValidusAOSP/packages_apps_Settings into staging

Conflicts:
	res/values/slim_strings.xml
merge derps
Update slim_strings.xml
screen record settings
revert app circle for reorg
App circle bar and omni catagory
Update slim_interface_settings.xml
Update slim_interface_settings.xml
revert sr global for now
Update InterfaceSettings.java
Update slim_interface_settings.xml