Do not set the network mode differently for LTE+CDMA

ro.telephony.default_network can be set if needed to set a different
value for LTE+CDMA. No need to hardcode preferred network mode in the source code.

Change-Id: Iae65f72a6a3bc31d500c5ecec87368a6f2a5d117

Conflicts:

	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
Cache resource ID lookups in aapt

This speeds up certain workloads considerably, particularly
those involved in buildling apps via the SDK.  Windows-based
use should particularly benefit from the change.
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Lockscreen: Option for Unlimited Widgets 1/2

Change-Id: I84233118664debce7f28e628eaf675c624533d0a
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>
Allow all widgets to be added to lockscreen.

Instead of this halfhearted approach, it should
be an option through ROMControl.

Make option for rc.
White Space

Change-Id: I75ee3ba85e0263f1e8f090beccaab2dbe2bbb7a4
Quicksettings: add favorite contact tile (2/2)

PS2+3: fix NPE

Change-Id: I08b8859fbef4f1ee71b3f6fb259afec3a3829199
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Prevent scanning during DHCP process

Wi-Fi should be in active state during the entire DHCP process, and
shouldn't go to IEEE 802.11 power save mode. If the framework requests
scan during the DHCP process, the Wi-Fi chip has to start scanning
on channels different from the current one, and going to power save
mode is a prerequisite for scan. The result directly impacts user
experience: DHCP process takes longer, and even can fail.

Change-Id: I8171388bb70072e4c42cb3c074dd955da84e494b
PowerMenu:  Add Screenshot, airplane mode, and Torch Icons needed.

More messes

operation make Jubakuba look good.

change int compares to boolean and add torch.

needs torch icons I just used screenshot for now.

PatchSet3: add torch icons

Change-Id: If448084d7c5657ceb5ef1a0447ae92a31f47f862
SystemUI: Fix/Update some quicksettings icons

Change-Id: Id9abcd0c7accbe154c0c36b2c13f99f863d02a68
Signed-off-by: Kyle Teague <kwesley1020@gmail.com>
QuickSettings: Ram Tile WIP Dont Merge 1/3

Need to do.

Clean up layout/ make moar prettier
Come up with a way to automagiclly turn the listener on and off

For now you can turn it on and off with a click

Ram tile and Ram bar can not run at the same time. one will
not update if the other is running.

Change-Id: I6940af075aa5a856cfd0056460e7395967d4a3bb
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
Telephony: Add getLteOnGsmMode() method (1/2)

Same functionality as the existing getLteOnCdmaMode, but for GSM
LTE devices.
Enable with the telephony.lteOnGsmDevice system property

From CM 10.0: Ibfb47ca608e51393b99d3308e0a6c66050b3f32e
- Moved getLteOnGsmModeStatic() to TelephonyManager.
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
add bools to overlay for Samsung CDMA SMS decoding hacks

ported from CM7/9/10

required by : http://review.cyanogenmod.org/#/c/26918/

Change-Id: I28093cdb8770f98b94cedbff63e6121c798cf9af

Conflicts:

	core/res/res/values/symbols.xml
Samsung STK support (framework/base part)

Change-Id: I08d169bc466df290fca838b09f6b0fbea2ac82a8

Conflicts:

	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
Merge remote-tracking branch 'bm/jb-mr1' into jb