[2/2] Add Tentacles Tile

Change-Id: I3cc777eb9a8f0dead852b2d89e67d7fea2cc798f
OctOs-fy CarbonFibers

Conflicts:
	res/values-it/strings.xml
	res/xml/sb_general_settings.xml

Change-Id: Ia35dbea31d0cccc9e4378dbbc6a7ea7568687a17
More Octofying

Change-Id: I3a9a3e2b7a448b58c109b6a2d7b8f531c506ef39
Minor fix

Change-Id: I1bcd41b362decfb3cae8e4017f5042228ecb76e7
Flip Tiles: default to off
Add back privacy guard manager [3/3]

Conflicts:
	res/xml/preference_headers.xml
Fix illegal fragment error for Privacy Guard

Fixes the following error:

FATAL EXCEPTION: main

Process: com.android.settings, PID: 3151

java.lang.RuntimeException: Unable to start activity ComponentInfo{com.android.settings/com.oct.tentacles.SettingsActivity}: java.lang.IllegalArgumentException: Invalid fragment for this activity: com.android.settings.applications.AppOpsDetails

	at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2224)

	at android.app.ActivityThread.handleLaunchActivity(ActivityThread.java:2274)

	at android.app.ActivityThread.access$800(ActivityThread.java:142)

	at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1203)

	at android.os.Handler.dispatchMessage(Handler.java:102)

	at android.os.Looper.loop(Looper.java:136)

	at android.app.ActivityThread.main(ActivityThread.java:5062)

	at java.lang.reflect.Method.invokeNative(Native Method)

	at java.lang.reflect.Method.invoke(Method.java:515)

	at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:779)

	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:595)

	at dalvik.system.NativeStart.main(Native Method)

Caused by: java.lang.IllegalArgumentException: Invalid fragment for this activity: com.android.settings.applications.AppOpsDetails

	at android.preference.PreferenceActivity.switchToHeaderInner(PreferenceActivity.java:1180)

	at android.preference.PreferenceActivity.switchToHeader(PreferenceActivity.java:1199)

	at android.preference.PreferenceActivity.onCreate(PreferenceActivity.java:545)

	at com.oct.tentacles.SettingsActivity.onCreate(SettingsActivity.java:78)

	at android.app.Activity.performCreate(Activity.java:6041)

	at android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1087)

	at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2178)

	... 11 more

Conflicts:
	AndroidManifest.xml
	src/com/oct/tentacles/SettingsActivity.java
Privacy Guard: remove summary

Conflicts:
	res/xml/preference_headers.xml
Make Privacy Guard a first class citizen in the Settings app.

Change-Id: Ie45e21cfa5190307923edf65f8ff5356fa305d70

Conflicts:
	res/xml/settings_headers.xml

Conflicts:
	res/xml/preference_headers.xml
Update default battery value to gray86(0xffdbdbdb)

Circle battery was showing up as bright white when it was supposed to be gray.  Temporary fix for bright white until we port new batteries to status bar.
Add new themes items to personalization menu

Bring in logic for the new chooser. If TMO chooser is installed it will get
first priority.

PS:
* fix string casing
* brought theme_settings.xml to latest HEAD.
    here I also hid the wallpaper entries as these require CM's new
    custom lockscreen & wallpaper picker.

includes:

Add Entrypoint for theme sounds
Change-Id: I6da2fa782b9b88fc669144eb50c3231d031cd620

Settings: preferences use keys, not ids
Change-Id: I23fad40f85235db1fd2c5724ba9d3580828b14d7

Change-Id: Ia8e852e5e5ad2465d0b9b73f16c7080a7337bb8a

Conflicts:
	res/values/cr_strings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java