Statusbar Network Speed Indicator (1/2)
Statusbar Network Speed Indicator Colors (1/2)
App ops

Change-Id: I07ff53dde8c3be5c34ee7f18d8addcb59849f585

Conflicts:
	res/xml/settings_headers.xml
Update settings_headers.xml
Update Values
Update StatusBar stuff
Fixed Typo
Display Settings: Better font size control

Use a SeekBar instead of a list/spinner to determine the font scaling.
For consistency, an approximate size (small, normal, etc.)
 and the exact percentage are displayed.

Change-Id: I96f80d93e740a25a6a6890b423a41c3900b93767

Conflicts:
	res/values/attrs.xml
	src/com/android/settings/DisplaySettings.java

Conflicts:
	src/com/android/settings/DisplaySettings.java
Merge branch 'cm-10.2' of github.com:torrented/android_packages_apps_Settings into cm-10.2
Update DisplaySettings.java
Appbar changes to compile and work with new CM "Display Settings: Better font size control" commit

Change-Id: I3ef5e525a471b07887fa158cc6d6e694984a1cce
Merge branch 'cm-10.2' of github.com:torrented/android_packages_apps_Settings into cm-10.2
Add SeekBarPreference.java
Merge branch 'cm-10.2' of https://github.com/CyanFox/android_packages_apps_Settings into cm-10.2

Conflicts:
	res/layout/preference_dialog_fontsize.xml
	res/values/attrs.xml
	src/com/android/settings/DisplaySettings.java
Update DisplaySettings.java
Statusbar && Navbar Customizations and Color (2/2)

Features:
[*]: Auto-hide Statusbar
[*]: Statusbar QuickPeek
[*]: Statusbar Transparency
[*]: Statusbar Colors
[*]: Navbar Enable/Disable
[*]: Navbar Dimensions
[*]: Navbar Colors
Merge branch 'cm-10.2' of github.com:torrented/android_packages_apps_Settings into cm-10.2

Conflicts:
	src/com/android/settings/DisplaySettings.java
Update cm_strings.xml
Update attrs.xml
Update attrs.xml