FULL ActiveDisplay Settings

Pac : Pimp up ActiveDisplay
f7a3e64fa3 Browse code
Der-Schubi authored

OmniGears: Fix pimp up ActiveDisplay …
9852cc52b6 Browse code
micku7zu authored

Change-Id: I51b2943829564910a3955d7f56fa7f872741e637

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
	res/xml/active_display_settings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/ose/ActiveDisplaySettings.java