bring again: Add user selectable size for sidebar [2/2]

Change-Id: I9933af3e5a95f76704ec3bbfe422fcb7594d29da

Conflicts:

	res/values/arrays.xml
	res/values/strings.xml
	res/xml/app_sidebar_settings.xml
	src/com/android/settings/chameleonos/AppSidebar.java