Bart Sears
0272df8506
am bcfe4152: Merge "Improve JavaDoc for WebView.loadData()" into ics-mr0
...
* commit 'bcfe41529b7bd9f572a2eff31375dc9fdf35b518':
Improve JavaDoc for WebView.loadData()
2011-10-13 16:27:16 -07:00
Dianne Hackborn
eabd328dee
Fix bug with CLEAR_TASK -- wouldn't clear the top activity.
...
Maybe this will also fix bug #5144065 as well.
I doubt I am so lucky, though.
Change-Id: I60bf595d3eff79353fdd94b0f2a089e81218bc30
2011-10-13 16:26:49 -07:00
Bart Sears
bcfe41529b
Merge "Improve JavaDoc for WebView.loadData()" into ics-mr0
2011-10-13 16:25:29 -07:00
Jim Miller
ee12e44b77
am 6252a8b1: Merge "Fix 5386408: Send accessibility event when a recent app is removed." into ics-mr0
...
* commit '6252a8b1167934d53fd76d5f0910d993390636ce':
Fix 5386408: Send accessibility event when a recent app is removed.
2011-10-13 16:23:28 -07:00
Jim Miller
6252a8b116
Merge "Fix 5386408: Send accessibility event when a recent app is removed." into ics-mr0
2011-10-13 16:21:51 -07:00
Adam Powell
fb99c53308
am 50b15348: Merge "Bug 5312828 - Menu button not responding" into ics-mr0
...
* commit '50b15348c5b61472b5ed02434968b5a035765b63':
Bug 5312828 - Menu button not responding
2011-10-13 16:15:17 -07:00
Adam Powell
50b15348c5
Merge "Bug 5312828 - Menu button not responding" into ics-mr0
2011-10-13 16:13:55 -07:00
Jason Sams
3fda6ed3c7
am 43b57ec4: Fix error printing if no command string is set.
...
* commit '43b57ec48ec7652addc11bbc9fef652c2394b7f5':
Fix error printing if no command string is set.
2011-10-13 16:13:07 -07:00
Jason Sams
43b57ec48e
Fix error printing if no command string is set.
...
Change-Id: I588c0d0a4e1b8f80c967ebfb6aff179a0cac4a36
2011-10-13 16:05:27 -07:00
Peter Ng
453b37f66c
Do Not Merge darker notification press state and divider
...
Bug: 3329721
Change-Id: I77ec70dd75d6e8009fc2f06741520167b7d34a42
2011-10-13 15:59:06 -07:00
Adam Powell
c6d51889c2
Bug 5312828 - Menu button not responding
...
Increase tolerance for apps calling invalidateOptionsMenu at
inconvenient times.
Change-Id: I712b20002afd0f056c3f05b160c5fa9c2ef0b552
2011-10-13 15:51:25 -07:00
Steve Block
33f962b22e
Improve JavaDoc for WebView.loadData()
...
Make clear that the charset specified in the mediatype portion of a data URL
overrides that specified in the HTML or XML document itself.
Bug: 5418915
Change-Id: Iff7305b6ac9e656d0fb7ed1b2ffe6fd0e21be49b
2011-10-13 15:32:13 -07:00
Justin Ho
bb290c891e
am 846601a1: Merge "Revert "Updated volume rocker assets for ring notification icon"" into ics-mr0
...
* commit '846601a1627a3be8f87601c13b87a22a6dbfafb4':
Revert "Updated volume rocker assets for ring notification icon"
2011-10-13 15:25:17 -07:00
Justin Ho
846601a162
Merge "Revert "Updated volume rocker assets for ring notification icon"" into ics-mr0
2011-10-13 15:23:20 -07:00
Justin Ho
d0922340aa
Revert "Updated volume rocker assets for ring notification icon"
...
This reverts commit 56505a6e7983d03b051d451d6120f29ccce8e09e
2011-10-13 15:22:53 -07:00
Justin Ho
0dc9937d4d
am 210ccb81: Merge "Updated wifi in range status bar notification icon" into ics-mr0
...
* commit '210ccb8110be9297acc94975d97156ee8ee2d61b':
Updated wifi in range status bar notification icon
2011-10-13 15:20:04 -07:00
Justin Ho
695d9b0a00
am b5e8a295: Merge "Updated volume rocker assets for ring notification icon" into ics-mr0
...
* commit 'b5e8a2955a45ab9f5409a8227b96d75d01cdfa5d':
Updated volume rocker assets for ring notification icon
2011-10-13 15:20:02 -07:00
Justin Ho
c08e682d71
am 96ae383d: Merge "Updated speakerphone asset" into ics-mr0
...
* commit '96ae383d9efbae8eb6a28d194de20ba03cb610e8':
Updated speakerphone asset
2011-10-13 15:20:01 -07:00
Justin Ho
d54b59e8a0
am 41f45e49: Merge "Updated stat_sys wifi icons" into ics-mr0
...
* commit '41f45e4969565d21f7d49b2b1cf828e27af73efa':
Updated stat_sys wifi icons
2011-10-13 15:19:59 -07:00
Justin Ho
210ccb8110
Merge "Updated wifi in range status bar notification icon" into ics-mr0
2011-10-13 15:17:34 -07:00
Justin Ho
496e809458
am 86e12a82: Merge "Updated Systembar back and highlight assets Bug: 5411737" into ics-mr0
...
* commit '86e12a82d2c25b04cbd2b51fb50b900b459593cd':
Updated Systembar back and highlight assets Bug: 5411737
2011-10-13 15:17:26 -07:00
Justin Ho
7c64cc76b6
am caea6473: Merge "Updated cut actionbar icon" into ics-mr0
...
* commit 'caea6473b46618040c8a8e611618e2c39d3506bf':
Updated cut actionbar icon
2011-10-13 15:17:25 -07:00
Justin Ho
b5e8a2955a
Merge "Updated volume rocker assets for ring notification icon" into ics-mr0
2011-10-13 15:17:22 -07:00
Justin Ho
96ae383d9e
Merge "Updated speakerphone asset" into ics-mr0
2011-10-13 15:16:52 -07:00
Justin Ho
41f45e4969
Merge "Updated stat_sys wifi icons" into ics-mr0
2011-10-13 15:16:37 -07:00
Justin Ho
86e12a82d2
Merge "Updated Systembar back and highlight assets Bug: 5411737" into ics-mr0
2011-10-13 15:16:11 -07:00
Justin Ho
caea6473b4
Merge "Updated cut actionbar icon" into ics-mr0
2011-10-13 15:15:48 -07:00
Justin Ho
a197abdc52
Updated wifi in range status bar notification icon
...
Change-Id: I5e91d14473908086848db552acec0df90e7104c2
2011-10-13 15:13:44 -07:00
Justin Ho
56505a6e79
Updated volume rocker assets for ring notification icon
...
Change-Id: Ibcdd8e88efaaba9e91a1b6959a83207c747b3195
2011-10-13 15:12:09 -07:00
Justin Ho
874c2c487b
Updated speakerphone asset
...
Change-Id: I5c799853a8ad851670cc58c8b4052859d8363d93
2011-10-13 15:10:41 -07:00
Justin Ho
719aeb5f17
Updated cut actionbar icon
...
Change-Id: Ib523594be8b3923adc21c6bee2ea4522f4fded79
2011-10-13 15:04:03 -07:00
Kenny Root
6ccd41265d
Add support for signature in getPackageArchiveInfo
...
GET_SIGNATURES was indicated as supported, but it never actually did
anything.
This is needed for the package verifier development sample.
Change-Id: I09ca6790cd8bf9435aa208c0711359b4d76fb278
2011-10-13 14:57:31 -07:00
Jeff Brown
c755ae3b58
Use MatrixCursor instead of ArrayListCursor.
...
ArrayListCursor is deprecated, and a duplicate private copy of it
is doubly so.
Delete some tests that are duplicated in the CTS package.
Change-Id: Ib5837b12e39dadba57595906ad621b1feb0d2c0d
2011-10-13 14:24:28 -07:00
Jeff Brown
825c5132bf
Add a CrossProcessCursorWrapper.
...
Bug: 5220669
The CrossProcessCursorWrapper is a useful building block
for wrapping cursors that will be sent to processes remotely.
It can also transform normal Cursors into CrossProcessCursors
transparently.
The new class fixes common performance problems and bugs
that applications have encountered when implementing
ContentProviders.
Change-Id: Icc59fec10add3f7d8cfbd0495447860c1872c752
2011-10-13 14:24:26 -07:00
Gilles Debunne
cbdd245793
Merge "Bug 5428541: Check that span is still in text before deleting"
2011-10-13 14:23:37 -07:00
Jeff Brown
b4009c7381
AbstractWindowedCursor is not special.
...
Use the CrossProcessCursor interface in the way it was intended
without introducing special cases for AbstractWindowedCursor.
This is possible now that we do not distinguish between local-only
and remotable CursorWindows so we don't need to provide a window
to the AbstractWindowedCursor for it to fill; it can provide one
for itself if it wants one.
This logic makes it possible to create CrossProcessCursor
implementations that perform just as well as AbstractWindowedCursors.
Change-Id: I764b25ee6311d28c50d1930705346b265faec86a
2011-10-13 14:17:24 -07:00
Christopher Tate
28e9046ed4
Merge "Require device encryption password to perform adb backup/restore"
2011-10-13 14:06:22 -07:00
Mike Lockwood
6982847062
am ab9d5b11: Merge "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled." into ics-mr0
...
* commit 'ab9d5b11737f8a460467657035186bcfa7085eb9':
PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled.
2011-10-13 14:01:23 -07:00
Mike Lockwood
ab9d5b1173
Merge "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled." into ics-mr0
2011-10-13 13:59:33 -07:00
Scott Main
3f7e26601a
am e89b6969: Merge "docs: add toc to emulator doc and a few cross-links" into ics-mr0
...
* commit 'e89b69691f6593d4287dd1d02c5d31561f6d4aa8':
docs: add toc to emulator doc and a few cross-links
2011-10-13 13:48:02 -07:00
Scott Main
e89b69691f
Merge "docs: add toc to emulator doc and a few cross-links" into ics-mr0
2011-10-13 13:46:23 -07:00
Adam Cohen
1bbb92deed
am c408a5d5: Merge "Fixing issue where widgets file was getting blown away, issue: 5036321" into ics-mr0
...
* commit 'c408a5d5738c84160a7e9a8299c953ea638bcef4':
Fixing issue where widgets file was getting blown away, issue: 5036321
2011-10-13 13:40:01 -07:00
Adam Cohen
c408a5d573
Merge "Fixing issue where widgets file was getting blown away, issue: 5036321" into ics-mr0
2011-10-13 13:38:00 -07:00
Mike Lockwood
5dca30affc
PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled.
...
Bug: 5426212
Change-Id: Iebe51609233ef17c108bbec680369793abbae1be
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-13 16:29:29 -04:00
Robert Ly
2bc97f70f3
am b14b2c25: Merge "docs: tools and adt md5sum and file sizes" into ics-mr0
...
* commit 'b14b2c25c20f77f7de0fd8b8fe59684a02add85f':
docs: tools and adt md5sum and file sizes
2011-10-13 13:21:53 -07:00
Robert Ly
b14b2c25c2
Merge "docs: tools and adt md5sum and file sizes" into ics-mr0
2011-10-13 13:20:08 -07:00
Dianne Hackborn
7fdf356837
am 97175bc3: Merge "Fix issue #5446988 : WindowManager warns BOOT TIMEOUT,..." into ics-mr0
...
* commit '97175bc3277055047d4c3e6109824065f2abec5d':
Fix issue #5446988 : WindowManager warns BOOT TIMEOUT,...
2011-10-13 13:14:43 -07:00
Dianne Hackborn
97175bc327
Merge "Fix issue #5446988 : WindowManager warns BOOT TIMEOUT,..." into ics-mr0
2011-10-13 13:13:20 -07:00
Adam Powell
9e45b78c4e
am aa79a5d5: Merge "Fix bug 5455676 - seek bars without thumbs" into ics-mr0
...
* commit 'aa79a5d5a3b06b5b4e40a1ab0ccc6697627b1a8d':
Fix bug 5455676 - seek bars without thumbs
2011-10-13 13:12:42 -07:00
Brian Colonna
7327b8a806
am 534b7af0: Merge "Fix 5437700: Underlying backup method was exposed" into ics-mr0
...
* commit '534b7af02782bdd36b96c6b83dfa7213d94b88c9':
Fix 5437700: Underlying backup method was exposed
2011-10-13 13:10:42 -07:00