Underp Blacklist settings
Settings: master switch to disable Halo (1/2)

-Port master switch from @Der-Schubi.
Fix typo
Themes: List ThemeSettings as a valid fragment

This fixes a force close in Settings in tablet mode.

Change-Id: I6542feba0d0fa8491ab9e092a90709d1034ffca8

Conflicts:
	src/com/android/settings/Settings.java
settings: Remove "mobile plan"

 * Useless menu item.

Change-Id: I0b35017cb9a52600cde5d31065f007210f916a41

Conflicts:
	res/values/bools.xml
Fix NullPointerException issue when user change

When info is null, we have risk to have access null point.

Change-Id: Ie6acee5c99d6297e31d46585435a735a38b19e82
make LinearColorBar themeable

Move colors to resources and use them instead.

PS2: Fix typo

AICP'fied.

Change-Id: I923e5daa219f302dc24e62faab666483109e6620
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>

Conflicts:
	res/values/colors_custom.xml
Add missing mdpi, hdpi, xhdpi drawables for new theme engine

Change-Id: I70dd75257f0e3a0a20b844a1ea3cc36506de177b
Show "Eject card" for usb storage

Readd the "Eject" options if the SD card is mounted via usb.

Change-Id: I802cf4d20eb3b45ce068f89c22352f79999d593e
Themes: List ThemeSettings as a valid fragment

This fixes a force close in Settings in tablet mode.

Change-Id: I6542feba0d0fa8491ab9e092a90709d1034ffca8

Conflicts:
	src/com/android/settings/Settings.java
Bluetooth: Release pan proxy object while coming out from tethering menu

A case where user is going into tethering menu & coming out repeatedly
(2000 iterations) irrespective of Bluetooth state(ON or OFF). Setting
application get crashed after 1386 iterations. Each time TetherSetting
& BluetoothPan object were leaked, because connection of the pan profile
proxy to the Service was not closed by tetherSetting while coming out
from tethering menu. Releasing the pan proxy object while coming out
from tethering menu to avoid memory/objects leak.

Change-Id: I06a5e1ed37a024695fddb1e95f62b72fd56510d3
CRs-Fixed: 622489
Bluetooth: Ignore the second button if one already pressed

Ignore the second buton if already one button is pressed,
this case comes when user is trying to press the both
cancel and ok for the pairing dialog.

Change-Id: I77516ec59a972b4451bb8cff69645f7b9089497f
CRs-Fixed: 624285
Fixes error message during pairing of HOGP devices

When incorrect pin key is entered by user in
the pairing pop up while pairing with a HOGP
device, no error message regarding the failure
is displayed to the user.

CRs-fixed: 618905
Change-Id: I1a5a8baf9ef6c71bf285a28b3e1839fe5ddbca95
Bluetooth: Increase allowed duration to connect to a profile

This patch increases the duration allowed between the first device
connection attempt (immidiately after bonding) and profile connection
after service discovery from 5 seconds to 30 seconds to allow
HOGP connections for slow connection conditions.

Change-Id: I5b17bd0bd2b560709e6e67e2d83f9bca7ea2509d
CRs-Fixed: 612105
P2PSetting:Avoid p2p_find on group removal event

Immediately after group termination p2p_find is being issued
from settings and this causing issue whenever user sends
connection request immediately after group_removal_event.

Change-Id: I6ae90a1d710e0e977a1dbc171398fd270dc30183
CRs-Fixed: 622597

Conflicts:
	src/com/android/settings/wifi/p2p/WifiP2pSettings.java
Packages : Fix for Softap turn ON/OFF fail issue.

If Softap is enabled using third party applications which make use
of WifiManager APIs, Softap enable fails. This is due to improper
handling of Softap State change event.

To resolve this issue, handle the Softap state change intent with
proper initialization of variable "mWaitForWifiStateChange".

CRs-Fixed: 634896
Change-Id: I63f8845ec3e8ebfa8ec09a7b1a1bc4ee175336cf
Settings/Wifi: Add support for Ad-hoc (IBSS) networks

If the WLAN driver can support IBSS mode, show Ad-Hoc (IBSS) networks in the
list of available Wi-Fi networks and allow to connect to or create new Ad-Hoc
networks.

This is merged and ported from CM-10.2, where it was split up into 3 commits.

Change-Id: Ib58d05d05ce00a77d5b88ee57007d38798d7b43d
Merge kitkat2 into kk44