Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
137,170 Commits 3 Branches 0 Tags
1811efdcc20a2ae307fdfa441e72e0423b4052bc
Commit Graph

40112 Commits

Author SHA1 Message Date
Dan Sandler
1811efdcc2 am afad5df6: Merge "Use DecorToolbar.getViewGroup() to get the view properly." into lmp-preview-dev 
* commit 'afad5df6425c2e6682b203e3e075e70ef56df9d0':
  Use DecorToolbar.getViewGroup() to get the view properly.
 2014-05-29 15:57:53 +00:00
Dan Sandler
5ec96a201e Merge "Use DecorToolbar.getViewGroup() to get the view properly." into lmp-preview-dev 2014-05-29 15:53:03 +00:00
Dan Sandler
6fdeeb34ae Use DecorToolbar.getViewGroup() to get the view properly. 
Bug: 15320825
Change-Id: Ib7e162c816fadf2b5c83af1326e7158f6bd69c8e
 2014-05-29 11:02:41 -04:00
Paul Lawrence
b6102427ae Merge "Hide crypto consts from docs" 2014-05-29 14:43:09 +00:00
Yorke Lee
547d9b9b55 Merge "Unhide ContactsCount API" 2014-05-29 14:35:53 +00:00
Christopher Tate
12eefc9f00 am 45ebf5d1: Merge "Widget restore documentation tweaks" into lmp-preview-dev 
* commit '45ebf5d19b6fc410eaafe1804f265503f585f682':
  Widget restore documentation tweaks
 2014-05-29 09:43:13 +00:00
Dianne Hackborn
d3a5b916b1 am c2091a1f: Merge "Add system layer for voice interaction services." into lmp-preview-dev 
* commit 'c2091a1fbc463941b3e42db36e369124ac3c1013':
  Add system layer for voice interaction services.
 2014-05-29 09:42:56 +00:00
Griff Hazen
6b5f93e92b am cc212d35: am 339f437d: Additional doc fixes for WearableExtender 
* commit 'cc212d35aa611324e98aa2092c1ab588a0efe794':
  Additional doc fixes for WearableExtender
 2014-05-29 07:24:18 +00:00
Griff Hazen
cc212d35aa am 339f437d: Additional doc fixes for WearableExtender 
* commit '339f437dc3f7c474d9cf1f963819bab2596e6ad3':
  Additional doc fixes for WearableExtender
 2014-05-29 06:34:01 +00:00
Griff Hazen
ca48d35423 DO NOT MERGE Cherry-pick: Additional doc fixes for WearableExtender 
Change-Id: I3764e4d97c0007b905ff0f3eb553234668fd50e1
 2014-05-28 22:37:13 -07:00
Christopher Tate
2ddbbe7b94 Merge "Widget restore documentation tweaks" into lmp-preview-dev 2014-05-29 01:27:51 +00:00
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
Christopher Tate
c04e9aa916 Widget restore documentation tweaks 
- Fix broken Javadoc @see directives
- Linkify AppWidgetProvider in the documentation for the new
  ACTION_APPWIDGET_RESTORED broadcast
- Minor content edits

Bug 15022842

Change-Id: Ia7d4ad5be476c260492e1be5d83e21f6943a6847
 2014-05-28 17:56:53 -07: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
Dianne Hackborn
a923758d80 Merge "Add system layer for voice interaction services." into lmp-preview-dev 2014-05-29 00:18:25 +00:00
Dianne Hackborn
e30e02f5d9 Add system layer for voice interaction services. 
New window layer that voice interaction service windows
go in to.  Includes a new voice-specific content rectangle
that voice activities are placed in to.

Add specific animations for this layer, sliding down from
the top (though this can be customized by the voice interaction
service).

Also add the concept of activities running for voice interaction
services for purposes of adjusting the animation used for them,
again sliding from the top, but not (yet?) customizable by the
voice interaction service.

Change-Id: Ic9e0e8c843c2e2972d6abb4087dce0019326155d
 2014-05-28 17:16:51 -07: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
Brian Carlstrom
77b170cedc resolved conflicts for merge of 452c5921 to klp-modular-dev-plus-aosp 
Change-Id: I6044604b431eed0319579a1a3b9213c9a0aaf678
 2014-05-28 16:10:53 -07: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
Brian Carlstrom
452c592191 am 197565e0: Merge "Move to dalvik.vm.lib.2 to force default to libart" 
* commit '197565e0e800be3c731e679914f40afa1aab98fd':
  Move to dalvik.vm.lib.2 to force default to libart
 2014-05-28 22:31:39 +00: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
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
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
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
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
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
John Reck
4645ab81b7 Disable RT animations 
Bug: 15287046

Change-Id: Ib511053726153649ea1bda337d14bc05db4f0bf9
 2014-05-28 12:35:30 -07:00