Completely rebase strings.xml for PT-BR and fully translate

Fixed derps, added new lines, aligned code (I hope!)
Merge pull request #29 from gafanhotz/patch-2

Completely rebase strings.xml for PT-BR and fully translate
Update PT-BR translations

Added new lines, aligned code
Merge pull request #30 from gafanhotz/patch-1

Update PT-BR translations
Update strings.xml
Remove already defined strings
Halo: Add master switch to disable Halo (2/2)
Also did some cleanup.
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy
Revert "Halo: Add master switch to disable Halo (2/2)"

This reverts commit fe55abe988d6af9be0e9fe2d938a9e9519c9ff34.
String fixes

... and spanish translations

Change-Id: I5dd049fc443b830b0b7b74e57020253b8c94087a
Small cleanup
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy
Brightness Control on Status Bar (2/2)

Added Support to control the current brightness to the Status Bar.
Revert "Brightness Control on Status Bar (2/2)"

This reverts commit 494b402fcbb547878c472a3d1adc43e8ed81a14c.
CM Privacy Guard (2/2)

settings: Privacy Guard support

 * Add toggle to InstalledAppDetails to enable/disable privacy guard flag on
   a per-application basis.
 * Add toggle to enable privacy guard by default for applications.

Change-Id: If03aa5319c520b6c4a78887f0f46ef1443ddaa83

Conflicts:
	res/layout/installed_app_details.xml
	res/values/cm_strings.xml
	res/xml/security_settings_app_cyanogenmod.xml
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/applications/InstalledAppDetails.java

Remove sms security, we don't want it.

Change-Id: I44e38698986ea6bed960ea3407e9132b1d922728

privacy guard: Fix crash when uninstalling an app

 * Don't try to update the privacy guard flag while refreshing after an
   uninstall since the PM will throw an exception at us.

Change-Id: Idadb99fefc2861e871f6206b08c844dda742fa68

Add missing string

Change-Id: I499dfaa64fa480293aef1d232160850d7c9112a6

Syntax derp

Change-Id: I74e5b1d8796193d295798b12736b469edc1eb326
Stylus gestures features (2/2)

Forward-port of https://github.com/CyanogenMod/android_packages_apps_Settings/commit/b3d850521e0042b85422903c70130f350f57b87a
to CM-10.1

Change-Id: I0ab78f1129d2d04b0af21e9b38da027dfe3d1295

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
inputmethod: Fixup remove stylus preference for non stylus devices

This commit included following changes

 * Move show stylus icon checkbox to Pointer Settings Category
 * Fixup issues stylus preference doesn't remove if not supported
 * Improve the code remove stylus preference if not supported
 * Remove an unnecessary variable introduced on http://review.cyanogenmod.org/#/c/33774/

Change-Id: I0f2e1b5cda00033915bb25902ce970f9eda52048

Conflicts:
	res/xml/language_settings.xml
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy
Merge pull request #49 from linuxman94/privacyguard

CM Privacy Guard (2/2)
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>