Themes: data usage chart: move color values to resource file

This will allow themes to specify custom colors for
the data usage chart.

Change-Id: I17669348e8ac6dce63100604c1044f9de78056c2
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Settings : Launch only contacts picker for blacklist entry

Change-Id: I266d1ad7f1aab745728b33490268cb197188f2b3
Revert "settings: Enable location mode header switch"

This reverts commit 23584af740601c560b1d3ddf239bfbdf642ec176.

Conflicts:
	src/com/android/settings/Settings.java
Input settings: fix empty screen when launching from keyboard

Fixes AOSPA-439

Change-Id: I70a61d82f9cddbc88b8fb803081336bb79a98fa1

Conflicts:
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
fix build error
Revert "Input settings: fix empty screen when launching from keyboard"

This reverts commit 19b13e9fd9c88c64315f4292df7073c102cb18c4.
This is C-RoM
Remove Tab
Fix Black Dialog crash on Back button pressed.
Show statusbar in expanded desktop [2/2]
Credit CM

Conflicts:
	res/values/crom_strings.xml
Squash Hover Improvements

Master Switch
Option To Disable Notification drawer Icon
Options to exclude non-clearable and low priority notification
Add Profiles to SlimActions

Change-Id: Ia0848b16baad69c7e5f388291e70e4419c416e47

Conflicts:
	res/values-de/slim_strings.xml
QuickSettings: Added ProfileTile [2/2]

see frameworks commit for details

Patchset 2:
  using blunden's png resource
  making ProfileSettings reachable from the outside

Patchset 3:
  The profile tile should not be available if profiles are turned off

Side rant: I really hate manifest cleanups. i would wish for our
settings not beeing such a mess and comply with fragments properly.

Change-Id: I3e7bcce4b5f54b9bed065780779c9946a73936be
Merge remote-tracking branch 'upstream/kitkat-staging' into kitkat

Conflicts:
	res/xml/crom_settings.xml
	res/xml/crom_status_bar_settings.xml
	src/com/android/settings/crom/SystemappRemoverTab.java