Dialer: restore full compatibility with theme chooser

Change-Id: Id6d3d7d97d5c136779711eca66cc29cf59a2e205

Conflicts:
	res/layout/dialpad_fragment.xml
	res/values/colors.xml
	res/values/styles.xml

'rework and merge theme chooser changes to match cm.