Merge "AudioService: Restore volumes after boot and when a headset is plugged" into cm-10.1
ServiceState: add support for DCHSPAP

Change-Id: Ib0a328652c14580718400b00146b770481be5458
Merge pull request #17 from klin1344/cm-10.1

Bring in recent audio features from CM
latest pac
Merge branch 'cm-10.1' of https://github.com/PAC-man/android_frameworks_base into cm-10.1
Update QuickSettings

This commit restores Cyanogenmod's original structure. If we want to stay up to date we can't split the implementation.

Change-Id: I749f7f85d202e89208f2e38a7c95c8246053048f

Conflicts:

	core/java/android/provider/Settings.java
	core/res/res/values/symbols.xml
	packages/SystemUI/res/drawable-mdpi/ic_qs_lock_screen_off.png
	packages/SystemUI/res/drawable-mdpi/ic_qs_lock_screen_on.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim0.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim100.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim15.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim28.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim43.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim57.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim71.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_battery_charge_min_anim85.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_0.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_100.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_15.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_28.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_43.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_57.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_71.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_battery_min_85.png
	packages/SystemUI/res/layout/quick_settings_tile_user.xml
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTypeTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
	packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/LockScreenButton.java
	packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/NetworkModeButton.java
	packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/PowerWidget.java
	packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/ScreenTimeoutButton.java
	packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/SleepButton.java
	packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/SyncButton.java
Merge pull request #18 from Nick0703/cm-10.1

Update QuickSettings
Merge branch 'cm-10.1' of https://github.com/PAC-man/android_frameworks_base into cm-10.1
Modified to remove FC's experienced when changing NavBar targets, not always immediate I didn't have a problem until my screen turned off. Once I woke up the device I received constant SystemUI FC's. This commit resolves that issue.

Change-Id: I007b1e8e8fa9efb751d4238bdd1065f2735e57d5
Merge pull request #19 from xLaMbChOpSx/cm-10.1

Fixed NavBar causing SystemUI FC's
update to latest
Merge branch 'cm-10.1' of https://github.com/PAC-man/android_frameworks_base into cm-10.1