Fix Halo Options/Fix QuickSettings Derp
Halo: Add master switch to disable Halo (2/2)
Also did some cleanup.

Conflicts:
	res/values/strings.xml
	res/xml/tool_bar_settings.xml
	src/com/android/settings/paranoid/Toolbar.java
Add Statusbar Quick Peek [2/2]

Adds the ability to peek at the statusbar when hidden
by swiping down from the top edge of the screen.

Change-Id: I8784baa4c56c88bc0dd1dace8c7d7fee202f78b2

Conflicts:
	res/values/strings.xml
	res/xml/status_bar.xml
Settings: reduce navbar observer footprint (2/2)

time for code cleanup projects. Switch to same
logic we already use in QS/NT shortcuts. Use
only one string for the whole navbar config
This reduces massive the observer footprint.

NavRing and SlimPie will follow with same logic

cheers

Change-Id: Ia9c31c0723f3c8c55391ad6e43b6fe3e98c7470b
Settings: reduce navring observer footprint (2/2)

time for code cleanup projects. Switch to same
logic we already use in QS/NT shortcuts. Use
only one string for the whole navring config
This reduces massive the observer footprint.

This commit should as well the manta navring issue
in landscape

SlimPie will follow with same logic

cheers

Change-Id: I3da70c40cd1923f09e83bd39107cdf37a0da0119
Settings: reduce SlimPie observer footprint (2/2)

time for code cleanup projects. Switch to same
logic we already use in QS/NT shortcuts. Use
only one string for the whole SlimPie config
This reduces massive the observer footprint.

cheers

Change-Id: I967baabd09e6c85b8e857f8f57a096b9b8d48b92
[1/2] Add bluetooth triggers to profiles

Renamed WifiTriggerFragment to TriggersFragment as it is used by
multiple trigger types
Made AbstractTriggerPreference used by multiple trigger types
Renamed some strings to make more sense

Make sure the configured triggers are shown even if type is disabled.
E.g. when Wi-Fi is disable listing AccessPoints does not work for
triggers, already configured triggers will still be shown.

Change-Id: Ife78269586aa2ab7fa94d3462582e259f9228ab2

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
Fix lock settings pattern crash on configuration change

A helper class used in LockPatternView.onSaveInstanceState() and
.onRestoreInstanceState() wasn't set, causing to NPE settings once
a configuration change would happen while displaying lock pattern
input.

This is now set on creation.

Test case:
1) Enable rotation on device.
2) Open Settings/ChooseLockPattern preference.
3) Rotate device

Change-Id: Ic8091bc92dee2a9a23f4ddebd6de4111ec8ac318
Shorten clumsy and repetitive gesture strings

Change-Id: I77e4d980bcb2f2ed64169450e2de225d9ab3c079

Conflicts:
	res/values/cm_strings.xml
Settings: Rename 'Power sounds' to 'Charging sounds' and add summary

Change-Id: I1cb872917e2d03f0a1c77c25c27f2a0496f9bc05

Conflicts:
	res/values/cm_strings.xml
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
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/applications/InstalledAppDetails.java
Fix security settings derp
Merge pull request #1 from LiquidSmooth/jb2

update