Missed translations..
audio: Fixed dead lock in AudioService during volume change

- AudioService goes into dead lock when there is a volume
  change for source stream and the respective aliased stream
  simultaneously from multiple threads
- When setIndex is called for source stream, it also updates
  the index for the aliased streams. Meantime, setAllIndexes
  is called on aliased stream. Initially, it gets index of
  default device of source stream. It requires lock on the
  source stream. This is leading to a dead lock
- Fix is to avoid locking parent while updating child
  streams. Removing lock from method and synchronizing
  parent only when it is updating member variable.

Change-Id: Id38e539e2ec178ea25548312a1dd62d2de3043da
CRs-fixed: 635789
frameworks/base: Update quick launch shortcut icons/resources

Update the existing icons and add "xxhdpi" versions created
from a vector template. This commit cleans also the resource
files a bit up.

Screenshot: http://goo.gl/6CrMYr

Change-Id: I45abee5cf13cd239eb5b4402019afac28d6d5952

Conflicts:

	core/res/res/drawable-mdpi/ic_navigation_ring_blank_activated.png
	core/res/res/drawable-mdpi/ic_navigation_ring_blank_normal.png
	core/res/res/drawable-mdpi/ic_navigation_ring_ime_switcher_activated.png
	core/res/res/drawable-mdpi/ic_navigation_ring_ime_switcher_normal.png
	core/res/res/drawable-mdpi/ic_navigation_ring_screenshot_activated.png
	core/res/res/drawable-mdpi/ic_navigation_ring_screenshot_normal.png
	core/res/res/drawable-mdpi/ic_navigation_ring_silent_activated.png
	core/res/res/drawable-mdpi/ic_navigation_ring_silent_normal.png
	core/res/res/drawable-mdpi/ic_navigation_ring_sound_on_activated.png
	core/res/res/drawable-mdpi/ic_navigation_ring_sound_on_normal.png
	core/res/res/drawable-mdpi/ic_navigation_ring_vibrate_activated.png
	core/res/res/drawable-mdpi/ic_navigation_ring_vibrate_normal.png
	core/res/res/values/dimens.xml
Fix crash in widget pager - DO NOT MERGE

Fixes bug 14299491

Change-Id: I3c94cbd7f7923dc5a429c9929bc432a5dd29d04f
KeyChain: add explicit package for getPrivateKey.

Bug: 9964538
Change-Id: If67c1938e9506d4fa81b241bcbce2193d1b194ef
Use the correct package name for CHOOSER.

Bug: 13013106
Change-Id: I1f715de18e7108274f5a98234376d48c2d329438
frameworks/base: Fix binder parcel leak with getMetadata() API

When VideoView calls getMetadata API of MediaPlayer, parcel object
is getting allocated by MediaPlayer and metadata is created over
parcel object. This metadata object is returned to the VideoView
which is being GC without calling recycle on parcel which was
creating leak in binder virtual memory.

CRs-fixed: 669303
Change-Id: I1e265909ee42d4fabd8b2552668b3d84af994294
add framework torch service

Change-Id: I0c7a055b33fdebe697f23d207b20408e06eb74a8
Signed-off-by: Roman Birg <roman@cyngn.com>

Conflicts:

	core/java/android/content/Context.java
Fully fix interaction between torch and camera usage.

For doing this, two things are necessary:
- The torch shutdown needs to be synchronous, so that the torch app has
  a chance to release the camera before the camera app tries to use it.
- The torch service needs to track camera usage, so that it can notify
  the torch app if a camera is busy.

Change-Id: I521091d255ff4c251d97a0e8d65c9d2a80b9dae4
HeadsUp: Only remove heads up if attached to window

Attempting to remove mHeadsUpNoficiationView from the window manager
when it is not currently attached will throw an IllegalArgumentException
so we check if it is attached and if so remove it, otherwise carry on.

Change-Id: Ida916eba496c4183e47288ef24a8a93c46a7eddf

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
HeadsUp: Fix dismiss on back key press.

Change-Id: Ia213aeba114d153f5561622a2bea884963f3d8a1
SystemUI: improve one finger notification expansion

Fixes JIRA bug BACON-70.

Sometimes the quick settings ribbon would eat the initial ACTION_DOWN
setting mInitialTouchY in the expand helper, but we are clearly not in a
notification that we can expand here. So only set the initial y point if
we are inside the notification scrollview.

Change-Id: I628553ac15cc6b4ee3c682fe46bd1d96c6bc154d
Signed-off-by: Roman Birg <roman@cyngn.com>
SystemUI: fix double tap to sleep not working with secure lock screen

Double tap to sleep on status bar would only work on secure lockscreens if the
slider brightness control was enabled.

Change-Id: I7c4dc5b2f559aafae819422d747f92ac59631ffd
Signed-off-by: Roman Birg <roman@cyngn.com>

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Revert "hwui: Always enable the scissor while composing layer"

This reverts commit 77705ae235df4c977cf509fcafd8727695498aab.