Merge branch 'jellybean-legacy'
Settings: Introduce Privacy Guard Manager

Due that on the one hand a lot user are not familiar
with permissions and how to read them and on the
other user want to have a faster easy access to
setup privacy guard for several apps this small
manager assist the user to setup.

Privacy Guard Manager shows a list off all installed apps
Per default it shows only user apps which have critical
permissions privacy guard can protect.
The user can optional show in the list as well all system apps
or turn off the filter to show all apps undependent of the
permission the app has. To activate privacy guard for an
app a simple click on the entry activates it so that the user
can go fast trough the list. Longpress opens app detail page.
Initial help dialog tells the user how to use it.

Due the filter user who are unfimiliar with permissions can
fast see which apps are effected without deeper knowledge

cheers

SlimRoms

PatchSet3:
- go inline with AOSP style
- move PrivacyGuard by default into manager
- change behaviour off active icons

PatchSet4:
- change app icon size to 36dip

PatchSet5:
- string change

PatchSet6:
- add reset option to disable privacy guard for
  all shown apps in the list

PatchSet7:
- Cleaned up the intro dialog a bit.

PatchSet8+9:
- cleanup
- fix alignment of top checkbox

PatchSet10:
- fix permission filter

PatchSet11:
- improve icon loading

Change-Id: I6bc886393bf90f8daed92b66d5fee1ce9e1accd0

Conflicts:
	proguard.flags
	res/values/cm_strings.xml
	src/com/android/settings/SecuritySettings.java

Signed-off-by: Evan Anderson <evan1124@gmail.com>

Remove cm_strings

Change-Id: I0b59c96ead635e557e7b268261c137715a023191

Signed-off-by: Evan Anderson <evan1124@gmail.com>

Fix some derps from merge

Change-Id: I6fa3e720738db5f3fb08fa2f60276d496ecd4f6b

Signed-off-by: Evan Anderson <evan1124@gmail.com>

Missing bracket

Change-Id: I12b6499d4e9c24bcf6f6e205c3da8f4d0976b0b1
Signed-off-by: Evan Anderson <evan1124@gmail.com>
The real fix

Change-Id: I858528589c2c918fbc2e02c9c9a1aa2cf3855916
Signed-off-by: Evan Anderson <evan1124@gmail.com>
Revert "Halo: Add master switch to disable Halo (2/2)"

This reverts commit a0a85a7abad804d7827c374f971010e0447077a0.
Merge branch 'exp'