Merge commit 'e5e4282af1d2d4277c8e2c13a312be0187f44257' into gingerbread-plus-aosp
* commit 'e5e4282af1d2d4277c8e2c13a312be0187f44257':
Enable the call setting when the VoIP feature is supported.
If the VoIP feature is included, the user need to be able to
configure the internet call settings even if it is in airplan mode.
Change-Id: I00d73fb0d9213162b8a9887cad0f800418446787
The Settings application now provides a hook that can be used by an
operator or a vendor specific application to add an activity of choice
in the settings menu.
Change-Id: Id55da9fd4262bbfc6a5abf863799c747b0d75b24
Add a new top-level setting for car/desktop dock settings.
Sub menu contains one item - Audio (settings)
Sub text for Audio shows current docked status and launches either the
audio settings or a dialog saying that you're not docked and you need to
buy a new dock from Google (kidding).
The Settings app now shows a "Search settings" item,
if there is an activity that handles the Search settings intent.
This conditionally included settings is handled in the same way
as the sync settings.
