Revert "Fix equalizer tile in extended QS options"

This reverts commit 7d7d9954a0e2aeb121b539c5e65e6b4c162fb930.

Conflicts:
	packages/SystemUI/res/layout/quick_settings_tile_equalizer.xml

Change-Id: Ia82e44c3818aaf6967b9bea346583871325096ea
Revert "Extended QS Options: fix force close on theme changes"

This reverts commit 1fb1e381a5b2e1f90ff3bb131e4ff57c159ee144.

Conflicts:
	packages/SystemUI/res/values/cr_dimens.xml

Change-Id: I546353828e6a296f3cf525d1f30c26ba71e38469

Conflicts:
	packages/SystemUI/res/values/cr_dimens.xml
	packages/SystemUI/src/com/android/systemui/quicksettings/UserTile.java
Revert "Extended QS Options (1/2)"

This reverts commit cf0fbd582d9020aad4f31e49c6c0cb20e6f092c1.

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/values/cr_dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Change-Id: Idbf428676367a44f7ddf4e53be2880ffcbc4dbae

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/values/cr_dimens.xml
	packages/SystemUI/src/com/android/systemui/quicksettings/BatteryTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/UserTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java
QS: Make it possible to show smaller tiles (1/2)

* Remove text and show more tiles on one row

ps18: set icon margin based on density of device
ps19: adjust the margin
ps20: implement show text under the tiles
ps21: fix typo
ps22: underp

Change-Id: Ie247aba1ae5fbdb8f5298e30fb2f04a985e73532
QS: smaller tiles: Fix the text labels on small screen devices

The text labels are broken if the density is smaller than xhdpi

Change-Id: Ie9859a9d8d539249de1584953f28ac56256ef35c
QS: respect equalizer in switch to small tiles

Change-Id: I2fa7f721c5a884bcfad49eb9e6a104ea89b019a5

Conflicts:
	packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java