Merge pull request #3 from VlikeBanana/4.4

Add Battery on Lockscreen + Fixes
Initial empty repository
Merge branch '4.4' of ssh://97.81.45.99:29418/android_packages_apps_Settings into 4.4
Add Privacy Guard Slim version (2/2)

Re-implements slims ehanced privacy guard from 4.3
and adapt it to 4.4 changes

Change-Id: Ie87a72b4212e5a8063c1dfbf7fd759f3a14a0d12

Conflicts:
	res/values/slim_strings.xml
[1/2] Add support for custom LED colors notification

Change-Id: I552351bb002a6800e31bbaea450730e4c7f83bdf
Improve apps ops detail screen

thanks to Danny

+ enable appops manifest
+ little small improvements by us

Change-Id: I313faa6176018fa516592bf4f52b3b506c5041bd
appLists: set height and width for app icon

due that the app icons on a lot apps are a mess now and not consistent
due of changes in kitkat let us set them for dialogs to our fixed
36dp value which was a good value in the past for all app icons
in settings

Change-Id: I00cab4aa4ded517ef63a193b58a03138abd355d8
Theme: Make About phone > Status UI colors consistent

Change-Id: I8293409a1fdd2c180d055d07e5439e1f1597288a
Settings: Wi-Fi country code

Change-Id: I8a078bde0ab40818784635477eb466510a1c230e
privacy guard manager: fix intent call on fragment

we still need a top-level activity for showing app ops details.  Aliasing
trick is so the code that is now a fragment can still be called
AppOpsDetails

Change-Id: I05478ab1ce3932c38920ad2de0a2f12e38e2859a
Illusion Version 1/3
Add Illusion Version 2/3
Add Illusion Version 3/3
[2/2] Settings: Add lockscreen ring battery setting

Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18

Conflicts:
	res/values/custom_strings.xml
Update custom_strings.xml

fixed it. submitting
Merge branch '4.4' of ssh://97.81.45.99:29418/android_packages_apps_Settings into 4.4
Merge pull request #3 from IllusionRom/4.4

Update