add switch to disable halo (2/2)
Merge commit 'a22d7e5' into jb-mr1
DPI Groups

Change-Id: I55a7842a6fb86e637c13f5e30af98fc8f9c9ad31
Signed-off-by: iceandfire <arhamjamal@gmail.com>

Conflicts:
	res/values/strings.xml
	res/xml/settings_headers.xml
UIModes and system DPI

Change-Id: I3b6aa829130ba072899ac1728b0759146b141367
Signed-off-by: iceandfire <arhamjamal@gmail.com>

Conflicts:
	res/values/arrays.xml
Navbar height, get correct summaries and some fixes

Change-Id: I1d08caaaa58cb348f39f713478e93775168887c5
Move backup/restore, fix dpi groups intialization and change backup name

Change-Id: Ie3a076f81032ca44463adcf6c95dd1cc83731eab
Typo and more readable

Change-Id: Ie5c2b70b1b0996b87bae802b560a3633c64a937d
Some fixes in dpi groups

Change-Id: I8b61202f2160e959291b65d767f87fda1d1510ee
Options to set apps default layout and dpi

Change-Id: Ie7a7da8b53196d35a3d33895830f4d048c120adf
Fix dpi groups summaries

Change-Id: I1bbe136ac2c5ccb0d9d5d73c7cbfdad435e6f0db
Fix derp

Change-Id: I6bf34bb065eded028b1f6fda1d2e43afed687ba5
Fix navbar height dialog value when it is 0

Change-Id: I99d5731a94e04dcadec245598d0d08034c5f9158
Reboot dialog after restoring conf

Change-Id: I100c158b1a6f2f3fdd8970cbb2c64cf65ef9bf79
Per app layout, at last :)

Change-Id: I865c01dab91d91fee8193fe36c550974db00fae0
Correct preferences display

Change-Id: Iacc6e0cde87d47ee6eaaa34ffbdfb89a227a7bf5
Make system apps get default dpi

Change-Id: Icb5ef77d1d263a182ee3032a0407bb34ff4fd34d
Fix NPE

Change-Id: I2ef4fd39c3ce92258730260806ab73557a3edb5a
Code cleanup

Change-Id: I4f8e40038ba7655d2e8420c1bc2899a8fede99f8
App layouts list. Methond from AOSPA

Change-Id: I0b1719bc6c83641441914700943118339e35eafe
Widgets

Change-Id: I6ded1cfd42ae6dfa1806137a24ae39039ad501e7
Signed-off-by: iceandfire <arhamjamal@gmail.com>

Conflicts:
	res/xml/hybrid_settings.xml