40054 Commits

Author SHA1 Message Date
Kenny Root
e7efe8a50c am 62f21d4d: am 0ee29447: am 6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread
* commit '62f21d4d1158b7adbb78620788fe15d99fea842e':
  Allow updated system apps to retain priority
2011-01-12 19:05:02 -08:00
Andreas Huber
daf820e33f am f97e58ef: am c88b2c44: am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.
* commit 'f97e58efdac199906209781d04d712749f2a521d':
  Fail to parse duration instead of asserting, if the server response cannot be parsed.
2011-01-12 19:04:55 -08:00
Andreas Huber
660aa3a74e am 126410ed: (-s ours) am 0ef0d76a: (-s ours) am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues
* commit '126410ed9ec3dff26a4cf7fff41f098936d45b2a':
  DO NOT MERGE: Fix Matroska issues
2011-01-12 19:04:50 -08:00
Kenny Root
62f21d4d11 am 0ee29447: am 6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread
* commit '0ee294470d09e1de0ce0fe6e3246e98e450a4d26':
  Allow updated system apps to retain priority
2011-01-12 19:01:48 -08:00
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
900bc7e6d8 am dd14ec2e: am ef9932c2: Merge "Supress layout requests while a LayoutTransition is running." into honeycomb
* commit 'dd14ec2e85204f93b7f80c5afd2361c68b3dc4f0':
  Supress layout requests while a LayoutTransition is running.
2011-01-12 18:38:15 -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
82ab6868ea am 226ec1cb: am cb27d4b2: Merge "LayoutLib: use tags in logs." into honeycomb
* commit '226ec1cb1b89fa79b2228f0f21d7fc4be951263e':
  LayoutLib: use tags in logs.
2011-01-12 18:26:51 -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
5d7c09b3b6 am b2d782d0: (-s ours) am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
* commit 'b2d782d084fd8859ccd582ebd6bc38d947370b99':
  DO NOT MERGE: Fix parsing of ntp= PLAY response.
2011-01-12 18:03:26 -08:00
Kenny Root
5658db1703 am 91412cec: am 4aab4bc2: am 91c459ec: Copy user info from PackageSetting as well
* commit '91412cec421e1cc2944528daa18821e1968c0c6f':
  Copy user info from PackageSetting as well
2011-01-12 18:03:21 -08:00
Chung-yih Wang
4498fc23aa am 00a87d22: am eb74d1aa: am 65ba2c42: Merge "Add auth. username in SipProfile." into gingerbread
* commit '00a87d2240cbf12baf2bb414e4c6115c0e3bb12f':
  Add auth. username in SipProfile.
2011-01-12 18:03:18 -08:00
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
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
Chet Haase
b29407faf3 Fix null crash when fragments go away during animations
Change-Id: I239cabce3ce322fcc3f1246486b4bf05f0dd322b
2011-01-12 17:53:20 -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