140253 Commits

Author SHA1 Message Date
Dianne Hackborn
a427fcf2cb Merge "Fix issue #15689396: pre-installed DemoAPI tests fail..." 2014-06-20 02:15:46 +00:00
Dianne Hackborn
b65ea7bfc6 Fix issue #15689396: pre-installed DemoAPI tests fail...
...with a NPE on emulators running Google x86 API 19 image

Change-Id: Ib989127f48b0c02ec645b99827a9b775188684d8
2014-06-20 12:18:55 -07:00
Mike Reed
402c8f5a07 Merge "stop using (deprecated) SkBitmap::Config" 2014-06-20 00:30:35 +00:00
Mike Reed
b933055cf3 stop using (deprecated) SkBitmap::Config
Change-Id: Ic75b5fc6996578e9d95bd3a220439ec1541d7c3b
2014-06-20 10:28:37 -04:00
Jeff Brown
af861ab879 Merge "Perform haptic feedback for wake gesture." 2014-06-20 02:04:45 +00:00
Craig Mautner
5c99167634 Merge "Fix index out of bounds exception" 2014-06-20 00:24:32 +00:00
Craig Mautner
4132620f92 Fix index out of bounds exception
When removing the last activity in a stack.

Fixes bug 15776859.

Change-Id: Id507aa7864482ff1ff769833445d937b19de2bcd
2014-06-20 14:38:21 -07:00
Igor Murashkin
60679f6b7d Merge "camera: Get detailed error reporting from api1 Camera if open fails" 2014-06-20 18:26:34 +00:00
Igor Murashkin
a1d662716b camera: Get detailed error reporting from api1 Camera if open fails
* Also maps camera2 open errors the same for shim/nonshim paths

Change-Id: I08d9d1e30e72025c41bd54b702d7ae95b32257be
2014-06-20 11:26:39 -07:00
John Reck
b127713b58 Merge "Re-enable ViewPropAnimRT" 2014-06-20 02:09:17 +00:00
Eino-Ville Talvala
15d0f97473 Merge "Camera2: Call onCaptureSequenceAborted when appropriate" 2014-06-20 02:04:45 +00:00
Jeff Tinker
6a9687109c Merge "Add diagnostic error code to MediaDrm IllegalStateExceptions" 2014-06-20 20:43:34 +00:00
RoboErik
726735586c Merge "Add volume handling APIs to sessions" 2014-06-20 20:43:34 +00:00
Igor Murashkin
1788b0466b camera2: Shim fix hwLevel and minimumFocusDistance
Change-Id: Ie4ab330a738ac4c8e465eacade1bbc39bdb776fe
2014-06-20 13:45:46 -07:00
Jeff Tinker
d712e1a387 Add diagnostic error code to MediaDrm IllegalStateExceptions
bug: 13976775
Change-Id: I682dd66a79252a9ee030b3cab5deb350e653e933
2014-06-20 13:41:30 -07:00
RoboErik
ef3c9e9b05 Add volume handling APIs to sessions
This renames and moves the VolumeProvider and adds apis to
MediaController to get the current state of volume on a session and
to request changes to the volume.

Change-Id: I290e9efefb6676c805819a29e1d054c3192c6773
2014-06-20 13:39:41 -07:00
Eino-Ville Talvala
ee37e30c22 Camera2: Call onCaptureSequenceAborted when appropriate
Bug: 15524101
Change-Id: I4615d0b4ae3cae80609586f7dfa8373691a9e384
2014-06-20 17:24:40 +00:00
Yorke Lee
eff9661b2a Merge "Revert "Add getSystemPhoneApplication to TelecommManager"" 2014-06-20 00:24:32 +00:00
John Spurlock
ffb9439172 Merge "If we're not showing switch text, don't include in measure." 2014-06-20 00:24:32 +00:00
John Spurlock
e599488968 If we're not showing switch text, don't include in measure.
Naive fix for switch crashes when !showText.

Bug:15770311
Change-Id: I68839b61b907d62159e2c12349005683e9ac6436
2014-06-20 10:53:54 -04:00
RoboErik
56a004e936 Merge "Remove more dead audio service code" 2014-06-20 00:20:03 +00:00
Baligh Uddin
9e3dcfa25f am 1c74e20d: (-s ours) am 1b3a5217: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '1c74e20db1c59fdb4e9512339c1251830842c905':
  Import translations. DO NOT MERGE
2014-06-20 19:57:15 +00:00
Robert Ly
922d0e7963 am 149c1b09: am c9334fb1: fix typo on lmp-prev page
* commit '149c1b09ee683b1af90a9f21488ded197e31ffa7':
  fix typo on lmp-prev page
2014-06-20 19:57:10 +00:00
Robert Ly
a69c1c8197 am f6c5ee40: am 3323e554: Merge "add new image and landing page for l-preview" into klp-modular-dev
* commit 'f6c5ee4079291c5779ff3c5083eab60734f52c62':
  add new image and landing page for l-preview
2014-06-20 19:57:04 +00:00
RoboErik
6f0e4ddd66 Remove more dead audio service code
Hit a snag in remote volume changes. Trying off this round of
removal so I can work on fixing remote volume handling in a
separate CL.

Change-Id: I49b1ba4b75d770ba7c77da081755f3210a9e9483
2014-06-20 11:35:20 -07:00
Selim Cinek
00a78899af Merge "Scrimming the notifications when QS is open." 2014-06-20 00:11:43 +00:00
Selim Cinek
f54090e9bb Scrimming the notifications when QS is open.
Bug: 15394230
Change-Id: I4234bde0259ef296db73a43f69a765dbde5ddacd
2014-06-19 17:20:44 -07:00
Alan Viverette
a97f80562e Merge "Don't show text in Material-styled switch" 2014-06-20 00:11:43 +00:00
Alan Viverette
2a37cf8d76 Don't show text in Material-styled switch
BUG: 15754341
Change-Id: Iae43b31c6e445207a0c95b48d0f0befac0f5cc78
2014-06-19 17:09:10 -07:00
Alan Viverette
e93c90126b Merge "Add support for tint attribute in VectorDrawable" 2014-06-20 00:06:01 +00:00
Alan Viverette
9a77cb92da Add support for tint attribute in VectorDrawable
Also fixes docs reference in TypedArray.

BUG: 15375203
Change-Id: I8cd2f43bd73f50084e21e5b986af9dc1c1447ad6
2014-06-19 17:16:17 -07:00
Alan Viverette
83415838cf Merge "Put dither in GradientDrawable constant state" 2014-06-20 00:06:01 +00:00
Baligh Uddin
1b3a52170a Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-06-20 00:01:43 +00:00
Robert Ly
c9334fb1b8 fix typo on lmp-prev page
Change-Id: I3cc4c457d12c71a466b2be16022ac1e6835227b3
2014-06-19 17:00:55 -07:00
vandwalle
7610fa66cd add home network boost
Change-Id: I4b508b3f54304c0b3fea126c3905ed3322c2feee
2014-06-19 16:54:53 -07:00
Baligh Uddin
21681dcda4 Import translations. DO NOT MERGE
Change-Id: I7f78f8188fd6b2f04f96a5846c13314687c2554e
Auto-generated-cl: translation import
2014-06-19 16:53:45 -07:00
Alan Viverette
07c661e677 Put dither in GradientDrawable constant state
Previously the dither attribute would be dropped when cloning a
gradient drawable from constant state. Also fixes ShapeDrawable
theme extraction.

BUG: 15754194
Change-Id: I3071f5b8236cfa6acb549627a3dfac0618518dbf
2014-06-19 16:15:53 -07:00
Sungsoo Lim
b0586c9228 Merge "Make getAvailability() always return true" 2014-06-19 23:04:31 +00:00
Jinsuk Kim
2a07054632 Merge "Do not have HdmiControlService report deviceEvent for TV itself" 2014-06-19 23:04:31 +00:00
Jinsuk Kim
13c030e828 Do not have HdmiControlService report deviceEvent for TV itself
DeviceEvent should be used only for the other logical device,
not the TV device itself.

Also fixed a but not updating the logical address after the allocation.

Change-Id: I80cec9d5bb4b95d003c9d1c7ea13f02d7e76b322
2014-06-20 13:28:29 +09:00
Dianne Hackborn
19bb5705e1 Merge "Fix build." 2014-06-20 00:06:01 +00:00
Dianne Hackborn
9226fc9bf5 Fix build.
Change-Id: I8b05b1dc4fdd0460c2dc92359b85d88b9f0f4f80
2014-06-19 18:32:08 -07:00
Selim Cinek
f99d000764 Improve unlock motion further.
Bug: 15244051
Change-Id: I6f567ff327695ec6ece56748cd300b8103715811
2014-06-20 01:19:40 +00:00
Jorim Jaggi
a800167e57 Merge "Hide status bar in bouncer" 2014-06-20 00:06:01 +00:00
Jorim Jaggi
44cf91960d Hide status bar in bouncer
Also, it gets faded in synchronously with the other unlock
animations.

Bug: 15407838
Change-Id: Ie161dfe970a2b4035a2d4cc7bb847285160cf691
2014-06-20 00:47:56 +00:00
Jungshik Jang
7eca94c145 Merge "Use SystemAudioStatusAction in SystemAudioAction." 2014-06-19 23:04:31 +00:00
RoboErik
939f04f971 Remove dead code from keyguard
This only removes the pieces that are directly dependent on
IRemoteControlDisplay. There is still code for the transport controls
UI that could be removed.

Change-Id: I0ee4921fcba9aee8d8efcd16e2198a2000147416
2014-06-19 23:02:57 +00:00
Jungshik Jang
b41f9df104 Merge "Add for System Audio Mode" 2014-06-19 22:58:18 +00:00
Wonsik Kim
9e922ca970 Fix native calls to null pointer
Since DEVICE_AVAILABLE event fires right after initialization, it
could happen before TvInputHal.mPtr is set, which causes calls to
null pointer. Fix the bug by allowing TvInputHal to wait for mPtr to
be set before calling native methods.

Change-Id: Id07f15130beb69f77c16bf3c735285c31ae4a3a4
2014-06-23 14:06:19 +09:00
Jungshik Jang
ea67c183fe Add for System Audio Mode
Note that this is skeleton change and do not merge
till get full review from outside of CEC team.

This change introduce four apis for System Audio Mode

1. boolean canChangeSystemAudioMode()
  -  Whether to change system audio mode or not.

2. setSystemAudioMode(boolean enabled, IHdmiControlCallback callback);
  - Change system audio mode.

3. add/removeSystemAudioModeChangeLister.
  - Register/deregister listner for AudioModeChange.

4. getSystemAudioMode()
  - Whether to system audio is enabled or not.

Change-Id: I1e82365155a9f7f6c3ac5d9db4871cf6bad46865
2014-06-23 13:32:43 +09:00