Chris Craik
09daefbb9a
am ec67c4b0: Merge "Make ViewPropertyAnimator correctly damage shadow receivers" into lmp-preview-dev
...
* commit 'ec67c4b0ac8095c94c424a9fc37d7b11fa098ee9':
Make ViewPropertyAnimator correctly damage shadow receivers
2014-05-29 01:08:31 +00:00
Chris Craik
80d55ba8e2
am 9ecf9b12: Merge "Respect Z ordering in touch dispatch, software drawing" into lmp-preview-dev
...
* commit '9ecf9b1292d547aebe4588f1051b22f9683e2149':
Respect Z ordering in touch dispatch, software drawing
2014-05-29 01:08:26 +00:00
Zhijun He
d5a8d65b43
am 239ac054: Merge "Camera2: Update spec for thumbnail cropping behavior" into lmp-preview-dev
...
* commit '239ac0541bf7e0fc8b301d077b40e3e52cf32161':
Camera2: Update spec for thumbnail cropping behavior
2014-05-29 00:42:32 +00:00
Jinsuk Kim
d618555e45
Merge "Fix a bug calling a wrong HDMI-CEC Binder API"
2014-05-28 23:17:22 +00:00
Chris Craik
c1073c3376
Merge "Make ViewPropertyAnimator correctly damage shadow receivers" into lmp-preview-dev
2014-05-28 23:16:14 +00:00
Chris Craik
b8a0913471
Merge "Respect Z ordering in touch dispatch, software drawing" into lmp-preview-dev
2014-05-28 23:12:57 +00:00
Yin-Chia Yeh
56c8711bc0
am b17e5f3d: Merge "Camera2: Fix wrong index in ColorSpaceTransform" into lmp-preview-dev
...
* commit 'b17e5f3d9deeb3c80f4b45657897c138ff060bab':
Camera2: Fix wrong index in ColorSpaceTransform
2014-05-28 23:07:31 +00:00
Adam Powell
88e719fd3e
am 49a4961e: Merge "Toolbar factoring and ActionBar functionality integration" into lmp-preview-dev
...
* commit '49a4961efde042f4921393f59cff86c2b7889c71':
Toolbar factoring and ActionBar functionality integration
2014-05-28 23:07:25 +00:00
Zhijun He
f5fe63c35c
Merge "Camera2: Update spec for thumbnail cropping behavior" into lmp-preview-dev
2014-05-28 22:49:31 +00:00
Jinsuk Kim
5ac6225ea3
Fix a bug calling a wrong HDMI-CEC Binder API
...
Change-Id: I75e5de3ab820288f0fe6bebdc63d6dd680e18f8a
2014-05-29 07:47:51 +09:00
Zhijun He
50f7243ca0
Camera2: Update spec for thumbnail cropping behavior
...
Also update FULL capability spec (remove ZSL from the requirement list).
Bug: 15168075
Change-Id: I864baf35ffab9047b52facb29011682e724bbc9b
2014-05-28 15:23:21 -07:00
Elliott Hughes
9149c7abb2
am a487fb77: am df0e9ed5: am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC."
...
* commit 'a487fb77dff1a86fbd160694de41e32b74f10cb1':
Updated Trace.h to recognize ATRACE_TAG_BIONIC.
2014-05-28 22:18:03 +00:00
Yin-Chia Yeh
751cd0cb1d
Merge "Camera2: Fix wrong index in ColorSpaceTransform" into lmp-preview-dev
2014-05-28 21:54:41 +00:00
Mike Lockwood
3378717241
Merge "Add Audio Manager support for Bluetooth A2DP Sink profile"
2014-05-28 21:54:11 +00:00
Elliott Hughes
a487fb77df
am df0e9ed5: am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC."
...
* commit 'df0e9ed5536e2cab860f3ecf9dab0030a471766e':
Updated Trace.h to recognize ATRACE_TAG_BIONIC.
2014-05-28 21:48:46 +00:00
Adam Powell
6addcea6ae
Merge "Toolbar factoring and ActionBar functionality integration" into lmp-preview-dev
2014-05-28 21:44:01 +00:00
Elliott Hughes
df0e9ed553
am 862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC."
...
* commit '862be91276ec9532b3ed00d43fc7a750f1e6adb0':
Updated Trace.h to recognize ATRACE_TAG_BIONIC.
2014-05-28 21:41:30 +00:00
Lorenzo Colitti
c039803160
Merge "DO NOT MERGE - Support disconnecting while trying to connect." into lmp-preview-dev
2014-05-28 21:38:03 +00:00
Brigid Smith
461ac24b8c
Updated Trace.h to recognize ATRACE_TAG_BIONIC.
...
Bug: 15116468
Change-Id: I6aef941c6b6bd59347855f7265e701a3aaa08edc
2014-05-28 14:21:06 -07:00
Yin-Chia Yeh
884cddcdf4
Camera2: Fix wrong index in ColorSpaceTransform
...
Bug: 15309870
Change-Id: I89a043a005435695ac8649e20d4e0e58d0f62bc7
2014-05-28 20:54:24 +00:00
Eino-Ville Talvala
5b02e9f65f
am a4aad3d0: Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-preview-dev
...
* commit 'a4aad3d0e5c258d6bbf6254ec5ab80a470b1b529':
camera2: Update native/managed key mappings.
Camera2: switch API interface to java classses
Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
camera2: Add new metadata keys, change types for existing range keys
Camera2: Replace int[] by MeteringRectangle
2014-05-28 20:35:58 +00:00
Chris Craik
3048545c5a
Make ViewPropertyAnimator correctly damage shadow receivers
...
bug:14313537
Change-Id: Ib0a2fa1bf6b611acd26cec59203075a193e30a1e
2014-05-28 13:35:43 -07:00
Chris Craik
ab008f0c64
Respect Z ordering in touch dispatch, software drawing
...
bug:14390526
Change-Id: I617a6ea7dbac1facae246491a247cf307452fc0e
2014-05-28 13:35:10 -07:00
Eino-Ville Talvala
b9a65de1f7
Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-preview-dev
...
* changes:
camera2: Update native/managed key mappings.
Camera2: switch API interface to java classses
Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
camera2: Add new metadata keys, change types for existing range keys
Camera2: Replace int[] by MeteringRectangle
2014-05-28 20:33:42 +00:00
Mike Lockwood
0a40ec2192
Add Audio Manager support for Bluetooth A2DP Sink profile
...
Change-Id: Iff6035e85faf52647cc41a59f98ba2924300eb8d
2014-05-28 13:32:08 -07:00
John Reck
c93ee799ee
am 94e5ee1c: Merge "Disable RT animations" into lmp-preview-dev
...
* commit '94e5ee1c3b2c5f70a5e687a77dcc2c93db50b062':
Disable RT animations
2014-05-28 19:41:02 +00:00
John Reck
10d1b4d0b7
Merge "Disable RT animations" into lmp-preview-dev
2014-05-28 19:38:06 +00:00
Adam Powell
e021e6ed89
Toolbar factoring and ActionBar functionality integration
...
Toolbars now can act in the role of ActionBar with the exception of
navigation modes. Expandable action views are now supported as well as
populating menu items from a host window.
Change-Id: If477db9c7ad9f95723f28cf73cbf03a07ce9d6ad
2014-05-28 12:36:38 -07:00
John Reck
4645ab81b7
Disable RT animations
...
Bug: 15287046
Change-Id: Ib511053726153649ea1bda337d14bc05db4f0bf9
2014-05-28 12:35:30 -07:00
Christopher Tate
560ce61c59
Merge "DO NOT MERGE - Run the task manager service at startup" into lmp-preview-dev
2014-05-28 19:03:03 +00:00
Dan Stoza
00f535845b
Merge "SurfaceFlinger: Add sourceCrop to screenshot"
2014-05-28 18:31:38 +00:00
Paul Jensen
a46d3e1158
Merge "Adjust Network's SocketFactory to restrict host name resolution to that Network"
2014-05-28 18:26:29 +00:00
Griff Hazen
8c2a828849
am c15d315a: am a9cb1e66: Add full screen size preset to WearableExtender
...
* commit 'c15d315aeb2c23895e940560784bd51f7962b702':
Add full screen size preset to WearableExtender
2014-05-28 17:44:11 +00:00
Ruben Brunk
574936894d
camera2: Update native/managed key mappings.
...
Switches to using managed value classes for the following keys:
- android.sensor.info.sensitivityRange
- android.sensor.info.exposureTimeRange
- android.jpeg.gpsCoordinates
- android.jpeg.gpsTimestamp
- android.jpeg.gpsProcessingMethod
- android.statistics.lensShadingMap
- android.lens.info.shadingMapSize
Also fixes a minor bug in LensShadingMap
Bug: 14628001
Change-Id: Ia0f541242f529ab9ba3111db799306b198f2b40b
2014-05-28 10:26:21 -07:00
Amith Yamasani
d5ba868b0d
Merge "Fix singleUser attribute"
2014-05-28 16:42:42 +00:00
Amith Yamasani
4b9d79c30e
Fix singleUser attribute
...
Make it work correctly for singleton content providers.
Relax which apps can export singleton content providers.
Change-Id: I43d315c25ed76a876bfa6d5e0d1351bc19c9bdba
2014-05-28 09:39:36 -07:00
John Reck
81d29b5f0c
am 2d196d9f: Merge "Implement FlushCaches TODO" into lmp-preview-dev
...
* commit '2d196d9f9d4978fd0df80815e15012518be5ff18':
Implement FlushCaches TODO
2014-05-28 16:05:06 +00:00
John Reck
45d0192929
Merge "Implement FlushCaches TODO" into lmp-preview-dev
2014-05-28 16:02:06 +00:00
Griff Hazen
10f6de686e
Merge "DO NOT MERGE Cherry-pick: Add full screen size preset to WearableExtender" into lmp-preview-dev
2014-05-28 15:59:14 +00:00
George Mount
854ed1c4e2
am 27d805ea: Merge "Use activity transitions when launched from fragments." into lmp-preview-dev
...
* commit '27d805ea6fb5aa3dbe46d4f8af86c46bce523760':
Use activity transitions when launched from fragments.
2014-05-28 14:42:01 +00:00
George Mount
1cc3e2e7a0
Merge "Use activity transitions when launched from fragments." into lmp-preview-dev
2014-05-28 14:37:34 +00:00
George Mount
f0ebc5dc21
Merge "fixed mIsReturning initialized too late. DO NOT MERGE." into lmp-preview-dev
2014-05-28 14:37:19 +00:00
Sungsoo Lim
e0a88629e1
am 5e73be4a: Merge "Fix a typo" into lmp-preview-dev
...
* commit '5e73be4affbf84a4935ac310b8323bfc944caa7e':
Fix a typo
2014-05-28 10:09:40 +00:00
Sungsoo Lim
d3ee3ca90c
Merge "Fix a typo" into lmp-preview-dev
2014-05-28 09:37:29 +00:00
Jinsuk Kim
b0674f0f7c
Fix a couple of bugs in CEC services
...
- Correct conversion for byte to int for cec opcode
- Use the right Handler.obtainMessage() to pass an integer variable
Change-Id: Ie3e86225f1702decce454aeb197911a371f51c17
2014-05-28 09:30:39 +00:00
Lorenzo Colitti
38fe398453
DO NOT MERGE - Support disconnecting while trying to connect.
...
Currently, once a NetworkAgent has decided to connect, there's
no way to disconnect without first connecting and having
ConnectivityService tear down the connection. This is suboptimal
because it causes the transport to keep retrying even if it knows
that it will not be able to connect.
Instead, allow the transport to abort a connection request that's
in progress, as long as the agent is not yet registered with
ConnectivityService.
Also add locking to evalScores. evalScores should already have
been taking a lock, because it accesses member variables that are
also accessed by the send*methods.
Bug: 15295359
Change-Id: I913c341bdfc50be9c23b632399f53168e754c1c0
(cherry picked from commit 081e99c3ac341734467b65458f94adc160f50d6c)
2014-05-28 09:29:07 +00:00
Yin-Chia Yeh
8490ace76f
Camera2: switch API interface to java classses
...
android.sensor.info.physicalSize: float[] -> SizeF
android.statistics.hotPixelMap: int[] -> Point[]
android.tonemap.curve[Red|Green|Blue]: float[] -> TonemapCurve
Bug: 14628001
Change-Id: I1e085f5e640a059852fcb504b6dd5f884039e653
2014-05-28 01:36:54 -07:00
Eino-Ville Talvala
2bb91a7a68
Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
...
Also fix a minor bug in ColorSpaceTransform copying validation.
Affected keys:
android.colorCorrection.transform
android.colorCorrection.gain
android.control.aeAvailableAntibandingModes
android.control.aeAvailableModes
android.control.afAvailableModes
android.control.availableEffects
android.control.availableSceneModes
android.control.availableVideoStabilizationModes
android.control.awbAvailableModes
android.edge.availableEdgeModes
android.hotpixel.availableHotPixelModes
android.lens.info.availableOpticalStabilization
android.noiseReduction.availableNoiseReductionModes
android.sensor.calibrationTransform1
android.sensor.calibrationTransform2
android.sensor.colorTransform1
android.sensor.colorTransform2
android.sensor.forwardTransform1
android.sensor.forwardTransform2
android.statistics.info.availableFaceDetectModes
android.tonemap.availableToneMapModes
Bug: 14628001
Change-Id: Ic0a3ff0aaa6bfe872cf8fb740870618c3eee3008
2014-05-28 01:36:53 -07:00
Igor Murashkin
78712a8bd7
camera2: Add new metadata keys, change types for existing range keys
...
Also adds the following keys:
* android.control.maxRegionsAe
* android.control.maxRegionsAwb
* android.control.maxRegionsAf
* android.request.maxNumOutputRaw
* android.request.maxNumOutputProc
* android.request.maxNumOutputProcStalling
Changes the following keys' type
generations:
* android.control.aeTargetFpsRange
* (Range<Integer>)
* android.control.aeAvailableTargetFpsRanges
* (Range<Integer>[])
* android.control.aeCompensationRange
* (Range<Integer>)
* android.lens.focusRange
* (Range<Float>)
Bug: 14628001
Change-Id: I141847dffc4b0d89cea37c19a54d6d5faf24a9bb
2014-05-28 01:36:53 -07:00
Yin-Chia Yeh
817f8933ee
Camera2: Replace int[] by MeteringRectangle
...
Bug: 14628001
Change-Id: I8ae4efa24d41043046a84b04e5209259a8a21063
2014-05-28 01:36:53 -07:00