Fix NPE when cancelling the shortcut picker.

Change-Id: Id58410b5d5e99fe8361d21cec6ee3d15f382256c
Revert "Fix coding style."

This reverts commit 42b1727b5268363659ea1d8843452a33dc1f7c7b.

Change-Id: Ie8feb9dba61ce5cc263e4b09e063e0cd00ecdbe9
Revert "Bluetooth : Remove out of range devices after ScanComplete"

Reverting this change as it has some side effects and after
removing this gerrit the behavior is like commercial phone.

This reverts commit 2ba08f2d7efbfe7c0b0080f0e9a63e56d15695e7.

Change-Id: Ice89ccb6250f55f4e0235df27a3ecea64260b488
Halo MODs
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I91444b0e6b62228bdcf2b14864595fa01f91d447
Add wifi name to notification drawer
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I5255a316f55c349de8a8691eee3e97bd0060cfcd
HALO: Show summaries
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I7362cef59218ec3d6436dd23373089a3510df82d
fix up wifi and halo commits.  sloppiness.
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I9506c7cc94d13e1be5128888cecd06f2a26e6d5a
Revert "Add wifi name to notification drawer"

This reverts commit fe17f93646bc1cec47a1e356be23b27a31e1c2ea.
Merge tag 'android-4.3_r3' into hardwarekeys

Android 4.3 release 3.0

Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	res/values/strings.xml
	src/com/android/settings/WirelessSettings.java

Change-Id: I552e3a07ce69cc0d848fcf6120a39b36731c2610

Conflicts:
	res/values-iw/strings.xml
Partition information menu

Author:    nobodyAtall <tsogkas@ceid.upatras.gr>

PS5: moved some things around
PS6: derp fixes and cleanup
PS7: whitespece massacre
PS8: fix0red
PS9: make it look good
PS10: fixed my previous derpz0rz

Change-Id: Ie5493bd9ba8e8e9bd251b417dcdfee0f3bd35e45
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	res/xml/device_info_memory.xml
Add external bluetooth GPS support (2/2)

Originally by
Cuong Bui <cuongbui@gmail.com>
Benjamin Bunse <ich@morphew.de>

http://review.cyanogenmod.org/#/c/20849/
http://review.cyanogenmod.org/#/c/20850/

http://review.cyanogenmod.org/#/c/36809/
http://review.cyanogenmod.org/#/c/36810/
http://review.cyanogenmod.org/#/c/36811/

Change-Id: Ia88ad9c70f89a09d308d2cccf9860c4d35470b24
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	res/values/strings.xml
	res/xml/location_settings.xml
Bluetooth: Set isPreferred to true for PanProfile Connections.

isPreferred is always true for PAN profile so that DUT can
initiate connection with remote device. Curretnly we are
returning true only when pan profile is in connected, so
it will return false when pan profile is not connected and
will never initiate connection on click.

Change-Id: I7c789add73ca944d074b0ecd8af223f6d61b547a
CRs-fixed: 463887
Bluetooth: Not allow Blank BT device name.

Add empty string check for BT device name
and not enable ok button until entered
device name is not empty.

Change-Id: Ib7c460bee5c8d86d13acd66d228279dd1a240c25
CRs-fixed: 471158
Bluetooth: Handle pairing Cancel intent.

Receive Pairing cancel intent and clear pairing request
from notification window.

CRs-fixed: 463362

Change-Id: I63c9299edca4356485f26cbc6332e3be9bdfbf17
Bluetooth: Handle BT search while rotate screen

Enable screen orientation in Settings app manifest.

CRs-Fixed: 519022
Change-Id: I74b70dafa1d8d12bf6770cb44a808cdf51555940
Add active display to ChameleonOS [2/2]

PS2:
Add pocket mode option, available if the device has
a proximity sensor.

PS3:
Add option to include ongoing and non-clearable notifications.

PS4:
Allow brightness control from 0% to 100%

PS5:
Refactor for release

Change-Id: Iae55640a31df68542c2af5d95097811b8fb1f66f
Active display: Add options for date and am/pm [2/2]

Change-Id: I6af47b2fd47e77398eee98cc6e30b8fcf1a44d45
Fix up active display options layout.  (Fixes force close)
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I5ba46e771895ccf7e437f0bfb51ee788906cb636
Revert "Merge tag 'android-4.3_r3' into hardwarekeys"

This reverts commit 50a0416fea419fc0c4a18ab944a1f95e15535b32.
Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/packages/apps/Settings into cm-10.2

Android 4.3 Release 3.1

Change-Id: I774916f77f3cbb3fc20404a1572799fb28c38b10