drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
137,184 Commits 1 Branch 0 Tags
Commit Graph

137184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Evan Charlton
89f858c874 Merge "@hide Telecomm APIs [DO NOT MERGE]" into lmp-preview-dev 2014-05-28 22:14:07 +00:00
Eric Laurent
0aa1cbb0de Merge "DO NOT MERGE - AudioManager: audio routing extensions" into lmp-preview-dev 2014-05-28 22:11:20 +00:00
Deepanshu Gupta
79ee46172b Update delegates 
Update layoutlib delegates in response to commit
a631a36de986acea2ef6fdfbaf3441a28b914b15

Change-Id: I897a7e3a61286bfae9054415d555febe16410106
 2014-05-28 15:04:50 -07:00
ztenghui
c9ad54e8ec Merge "Add translation and scale to the group tag and related tests." 2014-05-28 21:59:42 +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
Brian Carlstrom
5bc93866b0 Move to dalvik.vm.lib.2 to force default to libart 
Bug: 14298175

(cherry-picked from commit 2ef5abb8d534f016582d6023054cbe69d8114b6b)

Change-Id: Icd91982c09076e87092906106cbff4a81589e8de
 2014-05-28 14:53:40 -07: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
Brian Carlstrom
245b8f054b am a2260c26: Merge "Move to dalvik.vm.lib.2 to force default to libart" into lmp-preview-dev 
* commit 'a2260c26fc2499e1338a25f6f787a8d48ae48ddf':
  Move to dalvik.vm.lib.2 to force default to libart
 2014-05-28 21:44:55 +00:00
Lorenzo Colitti
ce2a1cd220 am d925573a: (-s ours) Merge "DO NOT MERGE - Support disconnecting while trying to connect." into lmp-preview-dev 
* commit 'd925573af1ceab0d4a447e738f1d8830e552edd1':
  DO NOT MERGE - Support disconnecting while trying to connect.
 2014-05-28 21:44:50 +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
Eric Laurent
0abcc5a0bb DO NOT MERGE - AudioManager: audio routing extensions 
Added API and classes allowing framework components
to have direct control over audio routing and volumes.

Change-Id: I28225a6ebad86a7836e1ed749d93c0e964e215f1
 2014-05-28 14:41:28 -07:00
Brian Carlstrom
617fc0c051 Merge "Move to dalvik.vm.lib.2 to force default to libart" into lmp-preview-dev 2014-05-28 21:39:29 +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
Elliott Hughes
862be91276 Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC." 2014-05-28 21:36:33 +00:00
Brian Carlstrom
3c1ff826e0 Move to dalvik.vm.lib.2 to force default to libart 
Bug: 14298175
Change-Id: I8afa91bddfb6fec6b61c39286a16594eb947830e
 2014-05-28 14:31:47 -07: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
ztenghui
452f6ece7f Add translation and scale to the group tag and related tests. 
bug:15288554

Change-Id: Iebe176d0a9c2c566d1910674a068e65e15569829
 2014-05-28 13:22:44 -07:00
Evan Charlton
b4eb0c0863 @hide Telecomm APIs [DO NOT MERGE] 
Change-Id: Id2d8d21f5de79bd5ffa468a82b29b77daf07e120
 2014-05-28 13:22:05 -07:00
Geoff Mendal
16a5727698 Merge "Import translations. DO NOT MERGE" 2014-05-28 20:00:00 +00:00
Paul Lawrence
e8fdc541dc Hide crypto consts from docs 
@bug 15192967

Change-Id: I134b2cb2d2841bc101e63a8a4dbd86f7b7bdca14
 2014-05-28 12:58:13 -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
Geoff Mendal
438d2aa536 Import translations. DO NOT MERGE 
Change-Id: Id746eaecbdcdaba6d605f9d9f978f0b6a8e0bf29
Auto-generated-cl: translation import
 2014-05-28 12:36:22 -07:00
John Reck
4645ab81b7 Disable RT animations 
Bug: 15287046

Change-Id: Ib511053726153649ea1bda337d14bc05db4f0bf9
 2014-05-28 12:35:30 -07:00
Christopher Tate
48d3eeda2d am 656f8e14: (-s ours) Merge "DO NOT MERGE - Run the task manager service at startup" into lmp-preview-dev 
* commit '656f8e147ed01b9ab90249f8ee5d3fa7ff66618f':
  DO NOT MERGE - Run the task manager service at startup
 2014-05-28 19:07:07 +00: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
Santos Cordon
2656c100c1 am caa3f3f3: Merge "Adding ITelecommService definition for Telecomm." into lmp-preview-dev 
* commit 'caa3f3f34751b571f47dce2b111078ed6c8d8a8b':
  Adding ITelecommService definition for Telecomm.
 2014-05-28 18:33:54 +00:00
Derek Sollenberger
90735dc0c6 Merge "Cleanup Canvas API by deprecating a few methods." 2014-05-28 18:33:27 +00:00
Dan Stoza
00f535845b Merge "SurfaceFlinger: Add sourceCrop to screenshot" 2014-05-28 18:31:38 +00:00
Santos Cordon
63ded51351 Merge "Adding ITelecommService definition for Telecomm." into lmp-preview-dev 2014-05-28 18:31:14 +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
Derek Sollenberger
0d181540e0 Cleanup Canvas API by deprecating a few methods. 
The clipRegion(Region) API exposed a different semantic than all other clip APIs by not
respecting the current matrix. The same behavior can be achieved by calling clipRect(Rect)
on the Rects within a Region.

bug: 14650725
Change-Id: I7e91813b8e2474f327e070e549fa303d66f8b552
 2014-05-28 14:26:06 -04:00
Narayan Kamath
80aceae89e am f4e0bf9f: am 98993813: am b75b3aaa: Merge "Build PacProcessor for 64 bit." 
* commit 'f4e0bf9fe191ab86ff1dd6ba8060a34826017928':
  Build PacProcessor for 64 bit.
 2014-05-28 18:02:16 +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
Geoff Mendal
2a94fda7ae Merge "Import translations. DO NOT MERGE" 2014-05-28 17:28:32 +00:00
Geoff Mendal
c77c6d8cfc Import translations. DO NOT MERGE 
Change-Id: Ib240a09629c6efd60f9209810de2ab0176a760c2
Auto-generated-cl: translation import
 2014-05-28 10:27:32 -07: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
Deepanshu Gupta
09e73848fb am eaa44910: (-s ours) Merge "Layoutlib fixes for L [DO NOT MERGE]" into lmp-preview-dev 
* commit 'eaa44910ade5493ca15ee10af037c1e92c1143f4':
  Layoutlib fixes for L [DO NOT MERGE]
 2014-05-28 17:22:16 +00:00
Geoff Mendal
eb4de55d1a Merge "Import translations. DO NOT MERGE" 2014-05-28 17:19:19 +00:00
Deepanshu Gupta
dc925857fc Merge "Layoutlib fixes for L [DO NOT MERGE]" into lmp-preview-dev 2014-05-28 17:18:59 +00:00