Quick launch powerMenu action
Credits:Rascarlo
Follow normal lock screen convention - allow user to retry when creating pattern lock

Change-Id: I6ad39b07b8de3de03146322b37b60e3f846093d1
Move quicklaunch power menu action above select apllication
Settings: network traffic color option (2/2)

Credits:LiquidSmooth
Fix status bar network traffic default color
Fix: Even when the list is entirely unchecked there may still be components
which are still protected and need to cleared when Reset is triggered.

https://jira.cyanogenmod.org/browse/BACON-679
https://jira.cyanogenmod.org/browse/CYAN-4835

Change-Id: Ifee3e8b87be39769aedfed0f9a5bda366c67ee45
ProtectedApps pattern lock for landscape mode.

Change-Id: I9ef70a0e363d4d17510188d24f4742f458fba38e
Merge branch 'kk' of github.com:SimpleAOSP/android_packages_apps_Settings into kk
Fix keyboard opening on pattern entry.

For protected apps, on some devices (consistent repro on flo), the soft
keyboard will open every time you enter the LockPatternActivity. Fix
this by setting the keyboard state to hidden in the manifest for this
activity.

Change-Id: I56fb6644cacd7a05100199637b1a27159ca04829
Separate Network options from Statusbar Settings

-Created a separate file for all Network options
Merge branch 'kk' of github.com:SimpleAOSP/android_packages_apps_Settings into kk
Over scroll effects [2/2]

Change-Id: I68da4183fe3c667059be9cf352723ffad4ef6103

Conflicts:
	res/values/liquid_arrays.xml
	res/values/liquid_strings.xml
	res/xml/display_settings.xml
Add Animation Preference
Revert "Allow changing theme to Holo.Light without crashing"

http://review.cyanogenmod.org/#/c/70745/ solves the issue
that this patch originally was created for.

This reverts commit 8cc23d58abc4874fe049a8dfa70910cf0b5dd9b2.

Change-Id: Ia350a03749202a2c0ae809400a3ebb554551d601
Settings: Remove leftover from old theme chooser

Change-Id: Iaf97e2b94c27839eb4f9827a77917fe21a311b4c
Settings: Fix alignment of print settings icon

In case the print header row was not used for an account row before,
the print icon appeared shifted to the left.

Change-Id: Ieeafca0c16083f4a45b57a1015bb412da26bb0e9
[2/3]TeloRadio

	* Configuration list
		> Enable manager
		> Use LTE
		> 2G with Wi-Fi
		> 2G with screen off
		> 3G to unlock

Change-Id: Iaee3bbe29e318f30f6d58b73a5f7a5c07778dc83

Conflicts:
	res/values/cr_arrays.xml
	res/xml/wireless_settings.xml

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
	res/xml/wireless_settings.xml
String edits
Fix SuperSU and SuperUser hiding
[2/2] NavigationBar Customization

Navigation Bar edit tutorial PNG

PS2: derp in display_settings.xml
PS3: NavBar.java Import DeviceUtils helper class and implement it for 'isPhone'

Change-Id: Ic413e209c1185b19dea6484d8388908beee5a7ed

Conflicts:
	res/xml/display_settings.xml

Conflicts:
	res/values/pa_strings.xml
	res/xml/display_settings.xml

Conflicts:
	res/values/simpleaosp_strings.xml