Jean-Baptiste Queru
b7a6563d17
am 4eeb1047: Merge 13212f83 from gingerbread-plus-aosp
...
* commit '4eeb10470ffafe8c508027f363ac66b58da5bf00':
Fix issue 2988031.
2011-01-29 08:57:47 -08:00
Jean-Baptiste Queru
4eeb10470f
Merge 13212f83 from gingerbread-plus-aosp
...
Change-Id: I9a8ee0c7e7896aea85e7a7c18ee82927091cb670
2011-01-29 08:54:06 -08:00
Jim Miller
346cb24d05
am 4876c29f: (-s ours) am 145643ca: (-s ours) am 226e5756: Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
...
* commit '4876c29f48dda11a2fd13d9a61050783565e7595':
Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
2011-01-29 08:53:01 -08:00
Jean-Baptiste Queru
52d3320815
am bf9f3ea7: Merge 34afc2cd from gingerbread-plus-aosp
...
* commit 'bf9f3ea72ea3201415acb3bb016de3009d3ed1b3':
API: Make close() throw an IOException.
2011-01-29 08:50:38 -08:00
Jim Miller
4876c29f48
am 145643ca: (-s ours) am 226e5756: Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
...
* commit '145643ca4bb98a88977026ea4d7866e391d53dce':
Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
2011-01-29 08:47:55 -08:00
Jean-Baptiste Queru
bf9f3ea72e
Merge 34afc2cd from gingerbread-plus-aosp
...
Change-Id: I2471571af1d8e34e7270cb6f765f16b4a474bb28
2011-01-29 08:45:29 -08:00
Eric Fischer
861a9c7108
am 16e52bcb: (-s ours) am e49e30cc: (-s ours) am 3d73c4d3: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '16e52bcbdf11c7411be683efabddf7080c54ffd2':
Import revised translations. DO NOT MERGE
2011-01-29 08:35:58 -08:00
Nick Pelly
e7662123f2
am 7a69ffa0: am 32f7d50d: am 21d0a173: Fix build - javadoc.
...
* commit '7a69ffa0e455cfb990b53d9dffa3b76c590dea0e':
Fix build - javadoc.
2011-01-29 08:35:53 -08:00
Scott Main
6857be3a2d
am 213705e3: am 51330184: am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
...
* commit '213705e37be670552ff30892b2e60f7b8d279a7e':
cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
2011-01-29 08:02:26 -08:00
Eric Fischer
16e52bcbdf
am e49e30cc: (-s ours) am 3d73c4d3: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'e49e30cc4d9411326735f15d92e8d7455467072f':
Import revised translations. DO NOT MERGE
2011-01-29 08:02:19 -08:00
Nick Pelly
7a69ffa0e4
am 32f7d50d: am 21d0a173: Fix build - javadoc.
...
* commit '32f7d50df147e4eb171044aad376bd1425fcf5e7':
Fix build - javadoc.
2011-01-29 08:02:04 -08:00
Scott Main
213705e37b
am 51330184: am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
...
* commit '51330184feb1b8d01ac48f4f13e4b91e7e334401':
cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
2011-01-29 07:59:28 -08:00
Jean-Baptiste Queru
8b10bdb494
am 7d4b7dab: Merge 55e124c4 from gingerbread-plus-aosp
...
* commit '7d4b7dab397fb780873303d60650bf0a0557cf41':
Clean up MifareUltralight API.
2011-01-29 07:38:41 -08:00
Jean-Baptiste Queru
7d4b7dab39
Merge 55e124c4 from gingerbread-plus-aosp
...
Change-Id: I8b428792ced31b73e8cc3743ab38e157578e9377
2011-01-29 07:32:39 -08:00
Robert Greenwalt
d84ac204f4
am b79c611e: am 19eecb02: Merge "Don\'t use mobile networktype icon if not connected" into honeycomb
...
* commit 'b79c611ebf16b7b03273e0a0bdac09181e50a12e':
Don't use mobile networktype icon if not connected
2011-01-29 06:53:07 -08:00
Robert Greenwalt
b79c611ebf
am 19eecb02: Merge "Don\'t use mobile networktype icon if not connected" into honeycomb
...
* commit '19eecb028fe094e5f41d9ddeb1e6aac1d096da43':
Don't use mobile networktype icon if not connected
2011-01-29 06:44:35 -08:00
Robert Greenwalt
19eecb028f
Merge "Don't use mobile networktype icon if not connected" into honeycomb
2011-01-29 06:35:57 -08:00
Justin Ho
cf5c0741e7
am a5e92d18: am 9b1df164: Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb
...
* commit 'a5e92d18b045bdf71c0445d34b2bfa775c582ab6':
Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style
2011-01-28 22:55:41 -08:00
Justin Ho
a5e92d18b0
am 9b1df164: Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb
...
* commit '9b1df1646ff4d480eebe2fd9cd394915b7925e92':
Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style
2011-01-28 22:54:11 -08:00
Justin Ho
9b1df1646f
Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb
2011-01-28 22:51:51 -08:00
Justin Ho
35326b876e
Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style
...
Change-Id: Ib78eb3f75b7734c0244fbc9ac58c52d2ffbbdb27
2011-01-28 22:49:43 -08:00
Justin Ho
f6b16886b0
am ab865ba7: am 9371f703: Merge "New honeycomb sound set" into honeycomb
...
* commit 'ab865ba7735264afde777842b1b9946686521357':
New honeycomb sound set
2011-01-28 19:24:10 -08:00
Justin Ho
ab865ba773
am 9371f703: Merge "New honeycomb sound set" into honeycomb
...
* commit '9371f7030011da2bcc45587e59a40a498f92dfb4':
New honeycomb sound set
2011-01-28 19:21:33 -08:00
Justin Ho
9371f70300
Merge "New honeycomb sound set" into honeycomb
2011-01-28 19:18:51 -08:00
Justin Ho
5f3bbcf554
New honeycomb sound set
...
Change-Id: Iaf3062f57f613702ea946fdf65e02f6265342ad5
2011-01-28 19:15:23 -08:00
Joe Onorato
5be5f51c2e
am 7f51171a: am a0f2cdb5: Merge "999" into honeycomb
...
* commit '7f51171ab3afebe9e9695c0991c579bc959a180d':
999
2011-01-28 18:52:26 -08:00
Joe Onorato
7f51171ab3
am a0f2cdb5: Merge "999" into honeycomb
...
* commit 'a0f2cdb50720b0a1960e5342b376867b2c9ad1df':
999
2011-01-28 18:50:03 -08:00
Joe Onorato
a0f2cdb507
Merge "999" into honeycomb
2011-01-28 18:47:57 -08:00
Joe Onorato
c6925ca684
999
...
Bug: 3403177
Change-Id: Ib53098f364bb15249f27f89127e0d2a4daf81d6a
2011-01-28 18:46:20 -08:00
Mathias Agopian
694f3e9cff
am 8d778b37: am 231da079: Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb
...
* commit '8d778b375ccb4945cdcd7cc93272a6d36466ad00':
fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
2011-01-28 18:43:08 -08:00
Mathias Agopian
8d778b375c
am 231da079: Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb
...
* commit '231da079c93664fa7d81c7e957990f17a6334b17':
fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
2011-01-28 18:40:44 -08:00
Mathias Agopian
231da079c9
Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb
2011-01-28 18:38:58 -08:00
Mathias Agopian
1723b049c6
fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
...
We were still destroying an ANativeWindow's buffer pretty soon
after it was removed from the window manager. This time
we really wait for the ISurace to go away.
Change-Id: I329273fedaeef76ee92836f6180c2c3808389330
2011-01-28 18:23:24 -08:00
Jason Sams
d649618814
am a66b759a: am bd08c7c0: Merge "Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection." into honeycomb
...
* commit 'a66b759ab01c7f1e334d7b9a9f7d78ce3b45ff1c':
Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection.
2011-01-28 18:02:57 -08:00
Christopher Tate
9805d8e081
Merge "Enable global (cross-application) drag/drop"
2011-01-28 18:01:56 -08:00
Jason Sams
b142f099d8
am 359113b4: (-s ours) am c8f6b6fb: Merge "DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1." into honeycomb
...
* commit '359113b42ee691749dfe717bb0ead5358045e615':
DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1.
2011-01-28 18:00:46 -08:00
Jason Sams
a66b759ab0
am bd08c7c0: Merge "Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection." into honeycomb
...
* commit 'bd08c7c0c99fa84dbf3c043f4e6dff07320410b7':
Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection.
2011-01-28 18:00:09 -08:00
Jason Sams
359113b42e
am c8f6b6fb: Merge "DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1." into honeycomb
...
* commit 'c8f6b6fbbc853bd89a7def780e8d9a4cabe6d0e2':
DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1.
2011-01-28 17:58:04 -08:00
Jason Sams
bd08c7c0c9
Merge "Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection." into honeycomb
2011-01-28 17:56:28 -08:00
Jason Sams
c8f6b6fbbc
Merge "DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1." into honeycomb
2011-01-28 17:56:09 -08:00
Jeff Brown
63ae90cd9d
Merge "Optimize IntentResolver to reduce lookup time by 50%."
2011-01-28 17:55:36 -08:00
Christopher Tate
251602f410
Enable global (cross-application) drag/drop
...
Also adds a new flag constant, View.DRAG_FLAG_GLOBAL, which indicates that
the drag operation should be allowed to propagate the drag outside the
originating app. When this flag is specified, all visible windows will
be notified about the ongoing drag.
Bug 3322724
Change-Id: Iaa3412a97f83f4e763019c9a03b5f09ebf75453f
2011-01-28 17:54:12 -08:00
Jeff Brown
2c376fc46c
Optimize IntentResolver to reduce lookup time by 50%.
...
IntentResolver frequently iterates over hundreds of different IntentFilters
and spends much of its time creating iterators and comparing strings.
This change avoids reduces the amount of garbage created by eschewing
iterators where possible. The FastImmutableArraySet type on its own
provides a 2.5x speed boost compared to repeatedly iterating over a HashSet.
In absolute terms, during orientation changes we spent about 160ms resolving
11 intents and performing 1129 calls to IntentFilter.match. Now we spend
half of that time.
Change-Id: Ia120e0082c8cf0b572a0317b9ef4a22c766dbad6
2011-01-28 17:34:01 -08:00
Xavier Ducrohet
da4927cada
am 115a5dd5: am f597f750: Merge "LayoutLib: update with Pair API." into honeycomb
...
* commit '115a5dd52cd2aafff76ed1e7bea2f5d860a60c2c':
LayoutLib: update with Pair API.
2011-01-28 17:25:35 -08:00
Xavier Ducrohet
115a5dd52c
am f597f750: Merge "LayoutLib: update with Pair API." into honeycomb
...
* commit 'f597f750392a26e1bc33430ff52e2dd3674c875b':
LayoutLib: update with Pair API.
2011-01-28 17:23:45 -08:00
Xavier Ducrohet
f597f75039
Merge "LayoutLib: update with Pair API." into honeycomb
2011-01-28 17:21:57 -08:00
Irfan Sheriff
af3d74c05c
am cc1bd4a8: am 739f6bc6: Keep never as the default wifi sleep settings
...
* commit 'cc1bd4a8ea2b171059607a1dbaac65fbfd9a0c04':
Keep never as the default wifi sleep settings
2011-01-28 17:21:18 -08:00
Irfan Sheriff
cc1bd4a8ea
am 739f6bc6: Keep never as the default wifi sleep settings
...
* commit '739f6bc675c0caa11a1d46b18de24e6c884f723a':
Keep never as the default wifi sleep settings
2011-01-28 17:19:38 -08:00
Robert Greenwalt
40cdd9b650
Don't use mobile networktype icon if not connected
...
bug:3398345
Change-Id: I0e8beb54e909e02bc551c54d65c5fed8e4e8cb10
2011-01-28 17:17:49 -08:00
Irfan Sheriff
739f6bc675
Keep never as the default wifi sleep settings
...
Bug: 3404049
Change-Id: I824b8cb7b28223cfb4eb89cabc7cb237a4e1e6db
2011-01-28 17:01:29 -08:00