Nick Pelly
d8edf98d07
am a21aa37b: am a058f565: (-s ours) am ca36d863: Update API current.xml to unbreak build.
...
* commit 'a21aa37be75f7d78188bf77671b574702644a5c1':
Update API current.xml to unbreak build.
2011-01-12 18:03:13 -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
Elliott Hughes
ef04ebdb85
update-api build fix.
...
Change-Id: If2524976f9212f61d8704422d4d14869379e3b80
2011-01-12 17:36:33 -08:00
Carl Shapiro
06a8ec7cf3
am 5b25aa2a: am e9739d09: Merge "Note the release in which functionality was deprecated." into honeycomb
...
* commit '5b25aa2ad46347c17ae0a3bfb8594df5eada8a87':
Note the release in which functionality was deprecated.
2011-01-12 17:26:08 -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
Elliott Hughes
50853aff78
am d91ce5d4: am f7bb4044: Merge "Fix build." into honeycomb
...
* commit 'd91ce5d4b14d3f948b1d32cb17eb666e5d493ba3':
Fix build.
2011-01-12 17:18:49 -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
c7b969a20d
am d1e3d232: am f4699efb: Merge "Possibly fix bad notification updates." into honeycomb
...
* commit 'd1e3d232ed7472479e1a7095b8aceac981ea2f4a':
Possibly fix bad notification updates.
2011-01-12 17:11:27 -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
Carl Shapiro
21e382d043
am b0b43c5f: am 0123afbb: Merge "Deprecate the allocation limit interfaces." into honeycomb
...
* commit 'b0b43c5f5681aa521bb1c80d0eb763654c9c512f':
Deprecate the allocation limit interfaces.
2011-01-12 17:06:59 -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
23a6b8e531
am 7f08308f: am 14bdce04: Merge "Remove legacy code that should not be used" into honeycomb
...
* commit '7f08308fda8b66f20505d8235795b86f5d8d2e36':
Remove legacy code that should not be used
2011-01-12 16:43:47 -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
c2036afefd
am 703b0bc9: am d6b13534: Merge "Only enable GL rendering on the main thread." into honeycomb
...
* commit '703b0bc95313d6b43befce7b8a4ac6f166ccb9dc':
Only enable GL rendering on the main thread.
2011-01-12 16:26:29 -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
Eric Rowe
425046fd3e
Merge "Add connect HID/NAP BT stress test"
2011-01-12 16:04:01 -08:00
Amith Yamasani
d157fb5332
am bf546169: am e1c99a1f: Merge "Remove popup indicator for dialog style preference items." into honeycomb
...
* commit 'bf546169a20b14329f1eca28d037c81273814fb6':
Remove popup indicator for dialog style preference items.
2011-01-12 16:02:58 -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
Amith Yamasani
e1c99a1f5b
Merge "Remove popup indicator for dialog style preference items." into honeycomb
2011-01-12 15:59:02 -08:00
Joe Onorato
c217ee39f0
am 0220736e: am 895eee7b: Merge "Remove the volume slider in SystemUI." into honeycomb
...
* commit '0220736e85b019c58186e47565af1faf58f99885':
Remove the volume slider in SystemUI.
2011-01-12 15:50:43 -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
53fa2a7c7b
am a39301b1: am 95a95717: New menu_dropdown_panel assets.
...
* commit 'a39301b1d0b31101b1d3380f0c3e08efaf6d4fc1':
New menu_dropdown_panel assets.
2011-01-12 15:44:38 -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
173c98fdcf
am 89bc2378: am 261fa998: am 25be5365: Implement canMakeReadonly().
...
* commit '89bc23783f2350c834623993835dac32d0862759':
Implement canMakeReadonly().
2011-01-12 15:35:20 -08:00
James Dong
6a3d731921
am 4fbf60e7: (-s ours) 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 '4fbf60e724ec6aff3ec8d78a5fdb284e98c914cb':
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:35:17 -08:00
Nick Pelly
1ba6125396
am 167ac435: am 6b9db1d8: am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread
...
* commit '167ac4355948e777b4680d86365fea78b24cdb8f':
Remove attemptDeadServiceRecovery() from TagTechnology's.
2011-01-12 15:35:13 -08:00
Nick Pelly
d6e4b03455
am 6d4372c3: am 19326cdc: (-s ours) am d64d711d: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
...
* commit '6d4372c3f498b3047efa261981656dacab8647ea':
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
2011-01-12 15:35:09 -08:00
Jason Sams
734a795427
am b7ec5469: am ef56ee31: Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb
...
* commit 'b7ec54699f51ba3ba30fe7be99babd74117e9eb8':
WAR driver bug where surfaces of size 0 fail.
2011-01-12 15:32:56 -08:00
Huahui Wu
54e80b7958
am f6a63f95: am 55873051: Merge "b/3344966 pan following the focus point instead the first point." into honeycomb
...
* commit 'f6a63f95a85a9fb7b2150e437cacc7db66451574':
b/3344966 pan following the focus point instead the first point.
2011-01-12 15:32:52 -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