am 22769993: am 939532e0: am 80dec847: Merge "Cherry-picking I25bf497e for MR1" into ics-mr1

* commit '22769993a1e8511af84c49161c0f032475023a48':
  Cherry-picking I25bf497e for MR1
merge in ics-mr1-release history after reset to ics-mr1
merge in ics-release history after reset to master
Reconcile with ics-mr1-release

Change-Id: I1316ee6433a4b594b3b0b7997c08a2a391cbae13
am 1a0475ac: Reconcile with ics-mr1-release

* commit '1a0475acc38b378e7beec69817c0f3fec045c93b':
am 8f4b2e12: am 1a0475ac: Reconcile with ics-mr1-release

* commit '8f4b2e12b8fdddb5501a1064db59efd815e594dd':
Better wording when choosing photo from PhotoSelectionActivity.

When there is already a photo for a contact, "Take photo" and
"Select photo from Gallery" don't sound as good as "Take new photo"
and "Select new photo from Gallery".

Bug: 5738108

Change-Id: I43e13774079695b0ecebc5d67576e2ea831706a0
am ced983d7: Better wording when choosing photo from PhotoSelectionActivity.

* commit 'ced983d7a816256d93fdea1f81e63e4598c18875':
  Better wording when choosing photo from PhotoSelectionActivity.
Stop using call origin when a dial intent is used

"Call origin" was introduced in I7b88b245e82e, to have
the app remember which tab is chosen when user's making
a phone call.

When a dial intent is used by 3rd party app, the tab
selection is done automatically and thus we should not
use the mechanism because the user didn't make a choice.

TESTED:
incoming calls
-> go back to calllog

outgoing calls
- make a phone call from dialpad -> go back to dialpad
- make a phone call from favorite -> go back to favorite
- make a phone call from calllog -> go to calllog
- make a phone call from call detail -> go to calllog
- make a phone call from People UI -> go to calllog
- make a phone call from dialpad and launch Phone UI
  again during the phone call
  -> go to calllog (strictly, "undetermined")
- make a phone call from contact card (reached via
  phone favorite) -> go to calllog
- make a phone call from favorite and add another
  person to the phone call via in-call ui
  -> go back to "favorite" (strictly, "undetermined")
- make a phone call from dialpad or favorite, bail out the
  in-call UI. Have the recipient hang up the call.
  Then have an incoming call again. Hang up the second phone
  call.
  -> go to calllog

new test for this fix:
- make a phone call per 3rd party's request
  -> go to calllog

Bug: 5728105
Change-Id: I48f03de752917c13046da629d9871155bcde2b10
Merge "Stop using call origin when a dial intent is used"
am 986387f6: Merge "Stop using call origin when a dial intent is used"

* commit '986387f614628a83e8d690eedf9d0383c0c53da7':
  Stop using call origin when a dial intent is used
merge in ics-release history after reset to master
Update Contacts for improved NDEF APIs

o Can always assume one NDEF message with one NDEF record is present.
o intent.getType() will always be lowercase.

Change-Id: I59541ba55d378a9f2bb6ed0c24b2f8cc0f4474dd
am cd564c95: Update Contacts for improved NDEF APIs

* commit 'cd564c953280182b64b2391c49e36a8c858f1e0d':
  Update Contacts for improved NDEF APIs
merge in jb-release history after reset to master
Import translations. DO NOT MERGE

Change-Id: I8bdcf1f7496d8d9569e0c6f8e6edee6224bf0157
am 572bbede: Import translations. DO NOT MERGE

* commit '572bbede244c38ee6089313707ba8ea1a0513778':
  Import translations. DO NOT MERGE
Support for high-resolution contact photos.

Rather than getting a bitmap directly from the gallery app, with
this change we create a temporary file and request that the photo
be stored there.  This avoids running into bundle size limits when
passing large, uncompressed bitmaps back from the gallery.

After reading the photo out into the Contacts app, we use the
openAssetFile API to stream the large photo data into the
Contacts Provider.  Note that we do this rather than having Gallery
write directly to the provider because we have no guarantee that
the Gallery (or substitute) app has WRITE_CONTACTS permission.

In the Contact Editor, the image is not permanently stored until
the contact is saved.  This avoids needing special logic to handle
the case where the contact is newly-created.

Fix bug 5907233 en passant... the vestiges of some partially-
expunged code were causing the ContentEditorFragment to not
apply a selected photo.

Bug: 5786849
Bug: 5907233
Change-Id: Ic0cabaa50c08d6a9a0b730698c92f4092192438a
Merge "Support for high-resolution contact photos."
am e286c04b: Merge "Support for high-resolution contact photos."

* commit 'e286c04b300feb9e4bdd13281a764103c1548323':
  Support for high-resolution contact photos.