Active display [squashed] (1/2)

Change-Id: I709196b232609a1dab8e9d7fdd0a6a655d487d93

Conflicts:
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
	core/res/res/values/cr_symbols.xml

Conflicts:
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
	core/res/res/values/ose_strings.xml
	core/res/res/values/ose_symbols.xml
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/values/cr_styles.xml
	packages/SystemUI/res/values/ose_dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Conflicts:
	core/res/res/values/ose_symbols.xml