PowerWidgetUtil: Re-enable LTE button.

- Also use Settings.Global.getInt() for PREFERRED_NETWORK_MODE.

Change-Id: I677de6353bf451fe4390ff74f9703b5df3beb39d
Apn settings fixes / code maintainence

Depends on : http://review.cyanogenmod.com/#change,13743

Cleanup unecessary resources and use global ones
  - This fixes the duplicate id issue currently causing apn's to be un-editable

Bring the ui aspect of the preference up to speed with ics
 - Use ics highlight / layout...etc
 - Use fragments

Patchset 5 : Remove theme for ApnEditor
             Use static access for variables
Patchset 6 : Launch apn editor internally as a fragment
	     Replace deprecated managedQuery with CursorLoader

Change-Id: I069415b29846f30665ce76e52f04115d1b65e455

Conflicts:

	AndroidManifest.xml

Conflicts:
	AndroidManifest.xml
	res/layout/apn_preference_layout.xml
	src/com/android/settings/ApnEditor.java
	src/com/android/settings/ApnSettings.java
Merge "PowerWidgetUtil: Re-enable LTE button." into mr1-staging
Merge "Apn settings fixes / code maintainence" into mr1-staging
Settings: Forward port ADB over network (Part 1 of 2)

Squashed commit of:
- Adb over network (Settings part for Jellybean)
  + Display WiFi IP Address & Port as preference summary.
  Note: adb_over_network were already pushed in 5555aae3
  Author: Tanguy Pruvot
  Id: Ia05aa8f6281c9bdcb3d5e62566b103c38bc70b82

- Settings : Fix mismatched dialog listener
  Set listener on correct dialog
  Author: Danesh Mondegarian
  Id: I0c05af859ad0e93ba6a1d3d395dc6c31e9949426

- ADB: missing dialog dismiss, and use updateCheckBox()
  this function check if debug features are enabled.
  Author: Tanguy Pruvot
  Id: I675a3a9ce5c28b16f9e13e78499e5f6f897b9dd3

- DevelopmentSettings: Refactor ADB over Network
  The checkbox would never enable adbd in tcpip mode.
  Author: Alexander Hofbauer
  Id: Iab8307bb91f69d85ed3a46d5ef09274fa8b03da

Change-Id: I6ff367cfd1bbf1db9b4862d3c5e8215959609e61
migrate vibrator to silent mode settings (2/2)

Change profiles:
* remove deprecated vibrator settings
* add silent mode settings

Available modes:
* off
* vibrate
* silent

Patch Set 1:
Initial patch with plain ListPreference

Patch Set 2:
Use Checkbox + Dialog like ConnectionSettings

Patch Set 3:
Rebase

Change-Id: I227f8b00f8dc17f06c8de6716c0f34b2faf82e2c
Merge branch 'mr1-staging' of https://github.com/CyanogenMod/android_packages_apps_Settings into mr1-staging

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/Settings.java
Makes the add button for new APNs appear in the action bar.

The APN add button (a plus sign) now appears in the action bar if possible. The APN list interface is now more consistent with the WiFi list interface. Previously the user had to press the 'Menu' hardware button or the three dot button on the screen in order to reveal the actions.

Change-Id: Iae622054ec080ba4775c22223dd75a865c83fc27
Signed-off-by: Manuel R. Ciosici <manuelrciosici@gmail.com>
Merge "migrate vibrator to silent mode settings (2/2)" into mr1-staging
Settings: Forward port Slider shortcuts

Includes Change I683d9c22: Add the new lockscreen drawables to the
picker list by Bjorn Lunden (blunden)

Settings : Lockscreen targets alignment fix

Add separate layouts for different layouts to fix alignment issues.

Change-Id: I2453225e8a683244a1e11f0a8d3c18954ba5885f

Change-Id: I155824abc0578d98d3e2f1f5c2dcde3fa7b2ef84
Settings: Forward port CM Screen Security settings (Part 1 of 2)

includes:
- Menu Unlock, Quick Unlock, Home unlock and Slide lock delay settings
  Author: DvTonder

- Lockscreen cleanup: Rework the logic to separate cm lockscreen
  settings from stock lockscreen settings.
  Author: Danesh M
  Id: Ic3eebc30fbb55afa6254889b17bde6e3083d1847

- Fix unknown sources crash
  Modify logic to only make cmsecurity specify the extra,
  any other time, default to stock security
  Author: Danesh M
  Id: Ida4b8ccc2f41d79aa9013029b4245ae4d3cd4496

- Adjust available options based on screen lock picked
  Disable / enable the available screen security aditional options based
  on what screen lock was picked.
  Author: jfassad
  Id: I634b18b58d0e1a1c075f9808776fc4f685316221

- Add home button unlock option
  Author: invisiblek
  Id: I10b96b2f788ca26bc45f1758e612b9dfe7beff59

Change-Id: I0dda524830d8dce571910eb1fbd66d5b5af11bff
Cid Head : Cyanogenmod version preference

Binds the cyanogenmod version preference to launch CID head upon
multiple taps.

Change-Id: I8e06642944d24581c0932c9964f2d9615bfcb832
Lockscreen Shortcut : Delete entry if reset

Delete the entry when resetAll is selected so that original AOSP
behaviour is present, such as magneticTargets.

Thanks Eddy Witkamp for reporting

Change-Id: I04e03336d8f51fd9683f6d859a649a37e68655ba
Merge "Lockscreen Shortcut : Delete entry if reset" into mr1-staging
Merge "Cid Head : Cyanogenmod version preference" into mr1-staging
Merge branch 'mr1-staging' of https://github.com/CyanogenMod/android_packages_apps_Settings into mr1-staging

Conflicts:
	src/com/android/settings/DeviceInfoSettings.java