Andreas Huber
f97e58efda
am c88b2c44: am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.
...
* commit 'c88b2c44117e7e3ff3deb786f7d984f4096a63de':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
2011-01-12 19:01:37 -08:00
Andreas Huber
126410ed9e
am 0ef0d76a: (-s ours) am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues
...
* commit '0ef0d76a9d5477942d5586933d35d299671fadc5':
DO NOT MERGE: Fix Matroska issues
2011-01-12 19:01:17 -08:00
Chet Haase
dd14ec2e85
am ef9932c2: Merge "Supress layout requests while a LayoutTransition is running." into honeycomb
...
* commit 'ef9932c2505eaf5a4256c6c398aa640bee3b47ea':
Supress layout requests while a LayoutTransition is running.
2011-01-12 18:35:14 -08:00
Chet Haase
ef9932c250
Merge "Supress layout requests while a LayoutTransition is running." into honeycomb
2011-01-12 18:33:05 -08:00
Xavier Ducrohet
226ec1cb1b
am cb27d4b2: Merge "LayoutLib: use tags in logs." into honeycomb
...
* commit 'cb27d4b2f530033c90432745115b914d8f26c3e7':
LayoutLib: use tags in logs.
2011-01-12 18:24:52 -08:00
Xavier Ducrohet
cb27d4b2f5
Merge "LayoutLib: use tags in logs." into honeycomb
2011-01-12 18:23:04 -08:00
Chet Haase
9c0874408c
Supress layout requests while a LayoutTransition is running.
...
LayoutTransition works by animating layout-related properties
(left, right, top, and bottom). This works great when that animation
is the only thing affecting the layout of the UI. But if there are other things
happening in the application that cause layout to run on that
container or in its parent hierarchy, this can cause the layout properties
on its children to get mis-set during the middle of the transition.
This results in artifacts like animating objects jumping to locations where
they would be were there no animation running.
The fix is to supress layout requests on that container (and its children)
until the transition is complete (then issue a layout request on the container
to make sure that the container has the correct layout data)
Change-Id: I15bf0423a11409f854076f86099233db7fe4edc0
2011-01-12 18:14:40 -08:00
repo sync
b2d782d084
am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
...
* commit 'd439ac396ecb9e909c543424211d563325fea72b':
DO NOT MERGE: Fix parsing of ntp= PLAY response.
2011-01-12 17:58:48 -08:00
Kenny Root
91412cec42
am 4aab4bc2: am 91c459ec: Copy user info from PackageSetting as well
...
* commit '4aab4bc2a3b97e25573e8484d5f5aa8deb812d48':
Copy user info from PackageSetting as well
2011-01-12 17:58:25 -08:00
Chung-yih Wang
00a87d2240
am eb74d1aa: am 65ba2c42: Merge "Add auth. username in SipProfile." into gingerbread
...
* commit 'eb74d1aab5f67ae3a4123fbab9a419595fab081c':
Add auth. username in SipProfile.
2011-01-12 17:58:08 -08:00
Nick Pelly
a21aa37be7
am a058f565: (-s ours) am ca36d863: Update API current.xml to unbreak build.
...
* commit 'a058f565663253077c3118d9aad00e03dcd45684':
Update API current.xml to unbreak build.
2011-01-12 17:57:30 -08:00
Carl Shapiro
5b25aa2ad4
am e9739d09: Merge "Note the release in which functionality was deprecated." into honeycomb
...
* commit 'e9739d09cb53fd05cc9229049b3d54c7f6816450':
Note the release in which functionality was deprecated.
2011-01-12 17:23:37 -08:00
Carl Shapiro
e9739d09cb
Merge "Note the release in which functionality was deprecated." into honeycomb
2011-01-12 17:21:46 -08:00
Carl Shapiro
7e942848ac
Note the release in which functionality was deprecated.
...
Change-Id: Ia0f361986e4232869f7d4123f75081100241638e
2011-01-12 17:17:45 -08:00
Elliott Hughes
d91ce5d4b1
am f7bb4044: Merge "Fix build." into honeycomb
...
* commit 'f7bb4044e3e11845fd0980ad2393236add5b32ac':
Fix build.
2011-01-12 17:16:17 -08:00
Elliott Hughes
f7bb4044e3
Merge "Fix build." into honeycomb
2011-01-12 17:14:43 -08:00
Elliott Hughes
f63e21d9ba
Fix build.
...
False-positive API change. (Removal of throws clauses for unchecked exceptions.)
Change-Id: I2c1fed74a5dc852ec1f3df72240bcfbdb6c77344
2011-01-12 17:13:40 -08:00
Joe Onorato
d1e3d232ed
am f4699efb: Merge "Possibly fix bad notification updates." into honeycomb
...
* commit 'f4699efb635dc7695e346343e9b9024ed225a612':
Possibly fix bad notification updates.
2011-01-12 17:09:06 -08:00
Joe Onorato
f4699efb63
Merge "Possibly fix bad notification updates." into honeycomb
2011-01-12 17:07:11 -08:00
Joe Onorato
c9596d6d8e
Possibly fix bad notification updates.
...
I think what was happening is that it was using a different layout but we were trying to reapply the
RemoveViews because of some bad boolean logic. This fixes that, and adds some better debugging that
might show us what else is happening.
Bug: 3298062
Change-Id: I0984f24cb2960166c79b9f2cc7c6a98bd75e17ba
2011-01-12 17:06:14 -08:00
Carl Shapiro
b0b43c5f56
am 0123afbb: Merge "Deprecate the allocation limit interfaces." into honeycomb
...
* commit '0123afbb228c2849f481b5219ce82c070562b04a':
Deprecate the allocation limit interfaces.
2011-01-12 17:04:38 -08:00
Carl Shapiro
0123afbb22
Merge "Deprecate the allocation limit interfaces." into honeycomb
2011-01-12 17:02:18 -08:00
Carl Shapiro
1107383e02
Deprecate the allocation limit interfaces.
...
Allocation limits relied on conditionally compiled code in the virtual
machine that was disabled in released versions of Android. As such,
these setter methods were glorified no-ops. Now that the feature has
been removed from the allocator this interface is thoroughly obsolete.
Change-Id: Id7f9de37ecfece4b909e35f110e118e131457133
2011-01-12 16:56:48 -08:00
James Dong
7f08308fda
am 14bdce04: Merge "Remove legacy code that should not be used" into honeycomb
...
* commit '14bdce0441378b766afca3eaa5ac78dbc2f7c6e1':
Remove legacy code that should not be used
2011-01-12 16:41:36 -08:00
James Dong
14bdce0441
Merge "Remove legacy code that should not be used" into honeycomb
2011-01-12 16:39:43 -08:00
James Dong
4507cef05e
Remove legacy code that should not be used
...
Change-Id: I9209e3a32b64a30627848d2a425f32ed6b73e8a2
2011-01-12 16:38:45 -08:00
Romain Guy
703b0bc953
am d6b13534: Merge "Only enable GL rendering on the main thread." into honeycomb
...
* commit 'd6b13534d44faee5bf80eb02495c17aa0195d381':
Only enable GL rendering on the main thread.
2011-01-12 16:24:27 -08:00
Romain Guy
d6b13534d4
Merge "Only enable GL rendering on the main thread." into honeycomb
2011-01-12 16:22:48 -08:00
Romain Guy
4f6aff3860
Only enable GL rendering on the main thread.
...
Change-Id: I41950f4c0a5063ee5d6950cf137eb60a1c7a72fe
2011-01-12 16:21:41 -08:00
Amith Yamasani
bf546169a2
am e1c99a1f: Merge "Remove popup indicator for dialog style preference items." into honeycomb
...
* commit 'e1c99a1f5bb86066d2e9ea48b27cf60d1b78544b':
Remove popup indicator for dialog style preference items.
2011-01-12 16:00:59 -08:00
Xavier Ducrohet
56222cfbe9
LayoutLib: use tags in logs.
...
Change-Id: Ib85272249d285ecef409bf063903bcd91514a424
2011-01-12 15:59:49 -08:00
Amith Yamasani
e1c99a1f5b
Merge "Remove popup indicator for dialog style preference items." into honeycomb
2011-01-12 15:59:02 -08:00
Joe Onorato
0220736e85
am 895eee7b: Merge "Remove the volume slider in SystemUI." into honeycomb
...
* commit '895eee7bac7dad66b51406d23529bec1dc9ad901':
Remove the volume slider in SystemUI.
2011-01-12 15:48:45 -08:00
Joe Onorato
895eee7bac
Merge "Remove the volume slider in SystemUI." into honeycomb
2011-01-12 15:47:08 -08:00
Joe Onorato
d7cbe592dd
Remove the volume slider in SystemUI.
...
Bug: 3344667
Change-Id: I8701fadac1736c73fbecb6f50d2ced7bba2c559c
2011-01-12 15:45:20 -08:00
Gilles Debunne
a39301b1d0
am 95a95717: New menu_dropdown_panel assets.
...
* commit '95a9571702e64857e7d8d7dc6c8a46caec874a6b':
New menu_dropdown_panel assets.
2011-01-12 15:42:43 -08:00
Gilles Debunne
95a9571702
New menu_dropdown_panel assets.
...
Bug 3330307.
The content region has been extended by one pixel.
Change-Id: I18bcc9af28a210dae8564a7463d21a896314cba4
2011-01-12 15:36:47 -08:00
Martijn Coenen
89bc23783f
am 261fa998: am 25be5365: Implement canMakeReadonly().
...
* commit '261fa99890ebd1ea15a6067859b0e931a3009859':
Implement canMakeReadonly().
2011-01-12 15:31:07 -08:00
James Dong
4fbf60e724
am 0569e589: (-s ours) am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread
...
* commit '0569e58988bae5f08733e21e8d8adfa61fe89b7f':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
2011-01-12 15:31:01 -08:00
Nick Pelly
167ac43559
am 6b9db1d8: am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread
...
* commit '6b9db1d8c808439abc12d572283b7fab50fb5257':
Remove attemptDeadServiceRecovery() from TagTechnology's.
2011-01-12 15:30:53 -08:00
Nick Pelly
6d4372c3f4
am 19326cdc: (-s ours) am d64d711d: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
...
* commit '19326cdcbf551728c54a844ddebe03b0f5d8d268':
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
2011-01-12 15:30:41 -08:00
Jason Sams
b7ec54699f
am ef56ee31: Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb
...
* commit 'ef56ee316cc361cd6519810ae3ae1051ed6fc79b':
WAR driver bug where surfaces of size 0 fail.
2011-01-12 15:30:18 -08:00
Huahui Wu
f6a63f95a8
am 55873051: Merge "b/3344966 pan following the focus point instead the first point." into honeycomb
...
* commit '558730510963ad80d7a539351b3f1cb16e3040c2':
b/3344966 pan following the focus point instead the first point.
2011-01-12 15:30:14 -08:00
Jason Sams
ef56ee316c
Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb
2011-01-12 15:28:19 -08:00
Huahui Wu
5587305109
Merge "b/3344966 pan following the focus point instead the first point." into honeycomb
2011-01-12 15:27:16 -08:00
Jason Sams
ec30933c1d
WAR driver bug where surfaces of size 0 fail.
...
Change-Id: I72b356c4cfb71f2342479ca21238b763d02e729d
2011-01-12 15:26:25 -08:00
Jason Sams
07e27a11e4
am 208a1c68: Merge "Implement more of copy2DRange*" into honeycomb
...
* commit '208a1c68ee21930112a3704bf8c46a9f27d8d04d':
Implement more of copy2DRange*
2011-01-12 15:24:08 -08:00
Jason Sams
208a1c68ee
Merge "Implement more of copy2DRange*" into honeycomb
2011-01-12 15:22:09 -08:00
Romain Guy
c038ea358a
Reenable region composition pipeline for layers
...
Bug #3341848
It works this time!
Change-Id: I0d371d8b2c75c67d4ce5009ddb990fe5e55a0a27
2011-01-12 15:08:47 -08:00
Justin Ho
b1c9d782d0
am 63be8dd1: Merge "Updated notification sounds for trygon" into honeycomb
...
* commit '63be8dd178447fce289c940638cd37aa560d9de3':
Updated notification sounds for trygon
2011-01-12 15:08:24 -08:00