Merge remote branch 'upstream/ics' into ics
Phone app - Update Italian Translation

Change-Id: I4a6a93dab235d702a638d6137b72dfdfc6aa7ba7
Phone: updated russian translations

Change-Id: I02ff2d3af7539c1939151af96a229ac1952a8d25
Merge remote branch 'github/ics' into ics
PT-BR: Missing translations

Change-Id: Ifece8f490c2deba34f5dc3f7c1573ed8ad804df4
Updated Hebrew Translation

Change-Id: Ieabb4d3a6a653c5100062da673e4aa4bbe954d89
Phone: Add Missed call and Voicemail specific  notification lights (3/3)

This commit adds the ability to use the configured missed call and voicemail
light settings

Requires Part 1 (Settings) and Part 2 (framework) commits

Change-Id: I70659f8948a2ff78d80df94f8a4a1af34f059e16
Merge "Phone: Add Missed call and Voicemail specific  notification lights (3/3)" into ics
phone : remove ldpi drawables

Change-Id: Ic328583ab8e71d91490d6ac20d3ea35483d8ed3c
Merge "phone : remove ldpi drawables" into ics
phone: OCD strings fix

 * Fix All Words Capitalized

Change-Id: I7f8e7ca77b712615db0f5e24fde09f3e60d16d27
Phone - Update Italian Translation

Change-Id: I963e4e3dbb5e01bb97325c5c7f858dcc754c9b96
Merge "Phone - Update Italian Translation" into ics
Change proximity behaviour for devices with fixed keyboard

The actual behaviour of Phone (ignore proximity sensor and force screen to stay
on when the keyboard is opened) while correct for a slidding keyboard, is not
correct in the case of a device with a fixed opened keyboard, like the HTC Chacha.

With this patch, you can indicate in the overlay that the device has a fixed
keyboard. When done so, the state of the keyboard will be ignored, and the screen
will be turned on/off based on the proximity sensor.
InCallScreen: change orientation to nosensor

This allows the InCallScreen to show in landscape mode
on devices where it applies (like HTC Chacha)
Merge remote-tracking branch 'cm/ics' into ics
packages/apps/Phone: squashed clean up of NetworkSettings from CAF

fixes: "Searching..." dialog that does not get dismissed if screen times out
fixes: crash when starting a new search before the old one has finished

packages/apps/Phone: Dismiss previous dialog before updating network list

After the network list is updated, the previous
"searching" dialog needs to be dismissed
even if the activity is paused.

Change-Id: I96aeccdd936b411e6077afb0abd288dd753e0582
CRs-Fixed: 319580

Fix crash in trying manual search again before first search completes

Manual network search query and responses are not synchronous.
This leads to multiple responses being processed consecutively.
A dialog is cleared on receiving the first response
and subsequent responses through exception when attempting to dismiss
the same dialog. Ignore the exception thrown by
dialogs as it is not benign.

Change-Id: Icc092b093af04ddfb15b2e5b30ac123577eab05c
Crs-Fixed: 326736
apps/Phone: Display Short Name/MCCMNC if Long Name is empty in manual search.

The operator name for each operator obtained in the Manual Network Search
should be derived as per 3GPP spec TS 22.101 A.3(Country/PLMN indication).
While deriving the name for current operator (already registered operator), as
per the spec if NITZ name has to be displayed, then some times the long name
can be empty in MM information. Since the operator information should be derived
from a single source, MM inforamtion cannot be combined with other sources
like ME DB information for long name. In such cases, Short Name or MCCMNC string
should be displayed in the Manual Network Selection.

Change-Id: I85f3cbd232fc4130084347aec9b4a8181b0fe896
phone settings: do not present duplicate operators to the user

filter out duplicates; use the operator numeric representation as the
criteria for finding duplicates since the numeric is what is actually
used when manually selecting an operator.

Change-Id: I71619a78d52d387bab938856ca6d0232105691cc
Phone: Use ICS alert icon

Change-Id: Ie65fdd9259d22557a11f27e38107bce29663b6ca