Revert "Forwatd port battery icon option [2/2]"

This reverts commit 0b8ad9cbc40fd2e805af81eed09207aee6043475.
Protected Apps: Increase hit target of the launch app button

Change-Id: I38355aca37079d43975d287ee9d81c3a500c3575
(cherry picked from commit 47e8e46f53cdf4f536845d57cc383d3c5f0ca893)
Buttons: Forward port Recents button configuration

Enables the ability to assign different actions to short and long
presses on the Recents (App Switch) button.

Change-Id: I5f8835841218932789431057e0531914a29980b9

Conflicts:
	res/values/cm_strings.xml
	res/xml/button_settings.xml
	src/com/android/settings/ButtonSettings.java
Feature : Volume adjust sound preference 2/2

This patch allows the users to choose if they want the audible tone when adjusting the volume

Change-Id: I6d43cba83bf4cf10f2d50502e7cee5408a73c520
Forward port battery icon option [2/2]

Bring forward the various battery icon options.

Still retains new options for where to show battery percentage text.

Change-Id: I75b3d9f4ba4b4206d2be5f2cd24ceceeae3234fc

Conflicts:
	res/values/cm_strings.xml
	res/xml/status_bar_settings.xml
	src/com/android/settings/cyanogenmod/StatusBarSettings.java