Fix dpi groups content

Change-Id: I0fb343cabf1c3681c9efb9090ee286b0f2c05cf6
Big code cleanup

Change-Id: I26e82cf9a0a1f5c602df96196bc5d83a58ac8e99
Merge branch 'jellybean' of https://github.com/XYAOSP/packages_apps_XYSettings into jellybean