'Quicktile row option:set 3,4,5 tiles per row (2/2)'

Conflicts:

	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Dismiss recents when hybrid option is clicked (Author: D4rKn3sSyS

Change-Id: Idaf06d19c243ef81201bdbf3f013a5302bae90de
Merge branch 'cm-10.1' of github.com:PAC-man/android_frameworks_base into cm-10.1
QuietHours Tile (1/2)

Allows user to toggle state of quiet hours

Part 2 : http://review.cyanogenmod.org/#/c/31302/

Patchset 2 : New drawables courtesy of Björn Lundén
         3 : Make multiuser compatible

Change-Id: I10f7b7befbf7405e47247d90bfee0f30c3ecd7c9

Conflicts:

	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
SystemUI : QuickSettings Cleanup

Introduce new class to reference from settings and SystemUI to avoid
code duplication.

Differentiate between configuration change vs tile layout modification.

Patchset 2  - Remove whitespace
Patchset 3  - Remove unused ids
Patchset 4  - Better organize the classes
Patchset 5  - Rebase
Patchset 6  - Introduce updateResources()
Patchset 8  - Update tiles to use updateResources()
Patchset 9  - Expand imports
Patchset 10 - Updated all tiles to support updateResources()
              Added dinamic tiles to mQuickSettingsTiles
              Optimized and standarized of calls to updateQuickSettings() from tiles
                 onPostCreate() -> updateTile() -> super.onPostCreate() -> updateQuickSettings()
                 updateResources() -> updateTile() -> super.updateResources() -> updateQuickSettings()
              Rebased
Patchset 11 - Remove unnecessary calls to update Quick Settings

Change-Id: I0baff915b4c3486cc0ac165e3e927399c2b15776

Conflicts:

	core/java/com/android/internal/util/cm/QSConstants.java
	core/java/com/android/internal/util/cm/QSUtils.java
	packages/SystemUI/src/com/android/systemui/quicksettings/BrightnessTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/ProfileTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
Fix duplicate codes

Change-Id: Ia37e522688a4acd9a8b9b628b03985b7c31d1354
Merge pull request #21 from Nick0703/cm-10.1

Quick Settings update... (1/2)
Squashed commit of Hybrid Tile (base)

Change-Id: Ic56a6d08a24c63dc866994c101ead30babc200a8
merge fix

Change-Id: Icfec0967340267d459c53a4a6d86ab3f83125755
Revert of "Hybrid Tile"
will be put back with proper ownership
Hybrid toggle

Change-Id: I5bdab2c3671c09ea0ba0b043f2c247ea3c02652a

Conflicts:

	core/java/android/provider/Settings.java
	core/java/com/android/internal/util/cm/QSConstants.java
	services/java/com/android/server/StatusBarManagerService.java
Custom view for hybrid toggle

displays DPI, Layout and Colors for the foreground app

Change-Id: I8b989365ec7a23bcd72780abf9eeb4e57eafd556
Open paprefs on long-press

Change-Id: I40411cd0fc54c7bc5e647e407f6b454178c50b4b
Derp

Change-Id: If3d359fd425609ddd581f9a428f78588612ed536
Caps

Change-Id: I1e5fa2d8681492ad579586ccabb9876e64573a12
SysUI/HybridToggle: do not launch with default intent

Change-Id: I0330f49a9c70b631b3cef794c92e07c82d8b0504
Code cleanup

A couple of fixes and some organization (untested but should work)
Fix build

Change-Id: If5a9d51d8522c9cb7b3d93c66baf287b29c71187
HT: quickapply, activity flags

Change-Id: Ie32e8c865eb457795af8c894911630c473b3afe9
Fix long tap

Not tested but should work

Change-Id: I5a16b0c22df687fdc4a75db44c4bbc012af1d6cf