John Reck
668f0e38ef
Async drawing!
...
Change-Id: I7e728356f58af88174328a8c0b90d27b128bfe01
2014-03-27 10:00:04 -07:00
John Reck
bcad68ad80
Merge "Move where updateProperties is called"
2014-03-25 17:46:18 +00:00
John Reck
632717e609
Merge "Add missing null check"
2014-03-25 17:25:33 +00:00
John Reck
5bf11bb98f
Add missing null check
...
Bug: 13635394
mDisplayListData can be null, make sure
to check for that before trying to walk through the
children list in updateProperties
Change-Id: I8d97b1656c1acf47b7c5df8a8771b0f30907261d
2014-03-25 10:22:09 -07:00
Tim Kilbourn
803d91b2b2
Fix NPE when inflating GradientDrawables.
...
Change-Id: If624d6efac61dabe6009ee4368ad7b119e1d4dcd
2014-03-25 10:13:02 -07:00
Przemyslaw Szczepaniak
0a8596dc0c
Merge "Documentation update for TextToSpeech#getFeatures"
2014-03-25 10:40:19 +00:00
Yohann Roussel
30494b70e9
Merge "Add one test application for multidex."
2014-03-25 09:38:43 +00:00
John Reck
bfb07a0377
Move where updateProperties is called
...
Change-Id: I27da448996019094c44487ce28c5689d098d6535
2014-03-24 21:00:18 -07:00
Alan Viverette
eebf17ad20
Merge "Unhide touch feedback drawable and wrapper"
2014-03-25 02:55:27 +00:00
Alan Viverette
840dede901
Unhide touch feedback drawable and wrapper
...
Change-Id: I98926d4adfb6e8c6130b31c8f4534a1a382d0f3b
2014-03-24 19:54:34 -07:00
Michael Wright
5da8ca9189
Merge "Respect ACTION_CANCEL for joystick fallbacks"
2014-03-25 01:48:06 +00:00
Alan Viverette
9bbbee116e
Merge "Implement APIs for obtaining, caching themed Drawables"
2014-03-25 01:26:15 +00:00
Alan Viverette
52b999f072
Implement APIs for obtaining, caching themed Drawables
...
When Drawables are inflated during preload (or otherwise without a theme)
they cache their themeable attributes in their constant state as an array
keyed on attribute index. Drawables inflated with a theme will simply
resolve theme attributes as part of normal inflation, and they will not
cache any themeable attributes.
Drawables obtained from Resources are pulled from theme-specific cache
when possible. If an unthemed Drawable exists in the preload cache, a
new constant state will be obtained for the Drawable and the theme will
be applied by resolving the cached themeable attributes and overwriting
their respective constant state properties. If no cached version exists,
a new Drawable is inflated against the desired theme.
Constant states from themed drawables may be cached if the applied theme
is "pure" and was loaded from a style resource without any subsequent
modifications.
This CL does not handle applying themes to several Drawable types, but it
fully supports BitmapDrawable, GradientDrawable, NinePatchDrawable,
ColorDrawable, and TouchFeedbackDrawable.
BUG: 12611005
Change-Id: I4e794fbb62f7a371715f4ebdf946ee5f9a5ad1c9
2014-03-24 18:00:26 -07:00
Michael Wright
9adca06514
Respect ACTION_CANCEL for joystick fallbacks
...
Also change MotionEvent.PointerCoords bit packing and unpacking
methods to be consistent with BitSets which are now used on the
native PointerCoords object.
Bug: 11480300
Change-Id: Ic6c7ebda5c545d07ea1ed259ca1f1184ccf85f29
2014-03-24 17:33:29 -07:00
Chong Zhang
29e4cf0a1a
am 2ac81ee6: (-s ours) am c4e6233b: am b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit
...
* commit '2ac81ee6ba51708d5504db5762ef44aafefc6ee2':
DO NOT MERGE change Surface constructor arg to 64bit
2014-03-25 00:32:17 +00:00
Chong Zhang
2ac81ee6ba
am c4e6233b: am b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit
...
* commit 'c4e6233b2097dbd23927a9a247229ab67f41e4f8':
DO NOT MERGE change Surface constructor arg to 64bit
2014-03-25 00:26:11 +00:00
Winson Chung
c9b0d58207
Merge "Fixing issue where we were relaunching each activity from recents instead of bringing them to the front."
2014-03-25 00:24:14 +00:00
Winson Chung
4be0445c66
Fixing issue where we were relaunching each activity from recents instead of bringing them to the front.
2014-03-24 17:22:30 -07:00
Chong Zhang
c4e6233b20
am b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit
...
* commit 'b68d38e81fd779011e478dcf9911fbe77f71f20e':
DO NOT MERGE change Surface constructor arg to 64bit
2014-03-25 00:20:03 +00:00
Ruben Brunk
0dfdcb1019
Merge "camera3: Update whiteLevel/greenSplit docs."
2014-03-25 00:12:21 +00:00
Ruben Brunk
e89b120eae
camera3: Update whiteLevel/greenSplit docs.
...
Bug: 13191430
Change-Id: I61cab65da546bdf1a748f46c28b6fce218b27bc4
2014-03-24 17:10:35 -07:00
Winson Chung
75c549c537
Merge "Moving task view layout into resource."
2014-03-24 23:03:37 +00:00
Winson Chung
37c8d8ef85
Moving task view layout into resource.
...
- Using new activity icon/labels
Change-Id: If27bf60d2df75813213e9f3095baeb03085da8f7
2014-03-24 15:55:39 -07:00
John Spurlock
66c49bc99d
am c3b7a671: (-s ours) am e2cae0a6: am 2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev
...
* commit 'c3b7a6718290dfc0cbd63039e76292f2ba35e43b':
Unhide Notification kind, rename to category.
2014-03-24 22:54:20 +00:00
John Reck
78ce1c5247
Add back clobbered cleanup
...
Change-Id: I418b612710850bbc3033c4bd0143fb0f0befd2cb
2014-03-24 15:43:49 -07:00
Jose Lima
41c2d2cec3
Merge "resolved conflicts for merge of 6c45157c to master"
2014-03-24 22:35:08 +00:00
John Reck
2ddf5166ea
Merge "Add stagingProperties"
2014-03-24 22:34:47 +00:00
Jose Lima
e911813840
resolved conflicts for merge of 6c45157c to master
...
Change-Id: I95d7f927f4321405318b44a21172b99f3f16e00a
2014-03-24 15:33:25 -07:00
John Reck
d0a0b2a314
Add stagingProperties
...
Change-Id: Ic7de551f8843fd70a77f738e33028e25c020bb3c
2014-03-24 15:31:34 -07:00
Ricardo Cervera
ae5d7d5d61
docs: Added new sensor types. Bug: 10674725
...
Original SHA-1: Ib378e3a1b3f1812b966c53a0eda6319f1bea464b
Original Conflicts:
docs/html/guide/topics/sensors/sensors_motion.jd
Change-Id: I8f8632410b2756174ea4dfab8d58486e58cd8db2
2014-03-24 15:24:43 -07:00
Dianne Hackborn
852472d9aa
Fix build.
...
Change-Id: I1dd79e932a551bd537d2c71e8fca29a299c9312f
2014-03-24 14:53:39 -07:00
Mark Renouf
de02cdc1e9
am 7390d4ab: am 3796594c: am a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev
...
* commit '7390d4ab8d12d5ffa5d28341096f4425247204a0':
Run finalizers before counting for StrictMode.
2014-03-24 21:25:41 +00:00
Craig Mautner
452fd49369
am 5332706b: am b98ee1eb: am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."
...
* commit '5332706b87c8772b97198e30c7cb4cc4ef3b577f':
Set ScreenshotSurface secure if any secure content is shown.
2014-03-24 21:25:37 +00:00
Jinsuk Kim
1c855178e4
am 775a097f: am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
...
* commit '775a097f01a349548d2124ae9d7dd562c72eaa27':
Add HdmiCecManager
2014-03-24 21:25:21 +00:00
Chris Craik
76c30ce3c1
Merge "Rework Outline API, remove isolatedZVolume remnants"
2014-03-24 21:22:36 +00:00
Chong Zhang
b68d38e81f
DO NOT MERGE change Surface constructor arg to 64bit
...
Bug: 12799017
Bug: 12799384
Change-Id: Ic16b4fa5394df38cee0378b6e00d1808b9c8cb94
(cherry picked from commit af608e81d450b962a443a21fb1a6feadeb355fe1)
2014-03-24 21:01:37 +00:00
Craig Mautner
f114a5c4d1
Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs"
2014-03-24 20:52:14 +00:00
Dianne Hackborn
43111e897b
Merge "Battery stats: wake locks, radio active, cleanup."
2014-03-24 20:42:31 +00:00
Dianne Hackborn
4590e52f3d
Battery stats: wake locks, radio active, cleanup.
...
- Improve wake lock work source updates to also update the current
history tag, in case the new work source gets recorded in the
history.
- Fix bug in recording radio active time that was not distributing
any time to apps.
- No longer hold a wake lock while dispatching data conn active call,
since it comes with its own timestamp.
- Fix issue where the top app was not being cleared while the screen
was off.
- Remove obsolete STATS_LAST stats type.
- Fix bug that was not clearing the total run time when resetting
the stats.
Change-Id: Iabe17a9edf34f762374ae09fcffb8a819cf72e30
2014-03-24 13:36:46 -07:00
Will Haldean Brown
48a5dbd3cc
Update current.txt for offset attributes.
...
Change-Id: I0f88a6f327edfc207c081e424e3c97edd1451c90
2014-03-24 13:23:42 -07:00
quddusc
370cd4677b
am 87eac093: am 5771d425: am 5b2e92e3: am 529d47ac: am e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs
...
* commit '87eac09358a49473549fa30e4acbf93c66b8915e':
docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
2014-03-24 19:36:50 +00:00
quddusc
0d828311ba
am ce6307d3: am 3ee70ca4: am 9c1eaeb0: am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs
...
* commit 'ce6307d3c84ebf200e35cabf70cf49712ac14e04':
docs: Added Javadoc for Gcore Jarlsberg release.
2014-03-24 19:36:45 +00:00
Selim Cinek
4c01eccb0c
am 38fc02d4: am d9e5761a: am 04ea3ca0: am 50ac19e9: am ba126c09: Disable Set Wallpaper button while loading image
...
* commit '38fc02d4efa9e943ab38306d466c5fe2786f1bb7':
Disable Set Wallpaper button while loading image
2014-03-24 19:36:14 +00:00
Chad Brubaker
87f738d278
am 51e93804: am 05e4dc96: am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev
...
* commit '51e938041e72f29c4e776a8627ea9d8a70d62728':
Fix support for simultaneous VPN tuns
2014-03-24 19:35:25 +00:00
Chad Brubaker
ff3bb2fe95
am 7f623d6b: am 9506e84b: am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
...
* commit '7f623d6b9459bc982c49f0a74aa2c9911f8e1dd8':
Include the interface for clearDnsInterfaceForUidRange
2014-03-24 19:35:20 +00:00
Ricardo Cervera
b7fe33633b
am 1575e1a1: (-s ours) am 419b17ec: am 1d77a874: am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs
...
* commit '1575e1a1f5c6a0e1d870af88cba8d54023dfbcab':
docs: Added new sensor types. Bug: 10674725
2014-03-24 19:35:11 +00:00
Chris Wren
8ed3b587f0
Merge "add more dump info for heads up notifications"
2014-03-24 18:57:06 +00:00
John Reck
1e1f4d705e
am 02e99e27: am ae316643: am aff40e25: am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev
...
* commit '02e99e272dbfedf5d9ba1ae91fa2b83cab5b3d07':
Eliminate mHasAlpha
2014-03-24 18:44:01 +00:00
Dianne Hackborn
48600b95ca
Merge "Fix issue #13564072 : Back button no longer dismisses IME after voice usage"
2014-03-24 18:37:51 +00:00
Dianne Hackborn
7d86734297
Merge "Get rid of not specifying a user errors in bluetooth."
2014-03-24 18:37:19 +00:00