Nick Pelly
b93ad06145
resolved conflicts for merge of d64d711d to honeycomb-merge
...
Change-Id: Ibe2c6d9f3d0070fb62f8385a9f49e605be37c885
2011-01-25 16:13:17 -08:00
Dianne Hackborn
ac8b760151
am 9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
...
* commit '9aac2e2b9541c424ca02483631b08949f0e90c8c':
Referencing of "r.record.name" is occured, when "r.record" is null.
2011-01-25 15:52:15 -08:00
Chris Tate
6eb3fc3ada
am bbff7ed4: (-s ours) DO NOT MERGE : Ensure that the first post-restore backup pass is correct
...
* commit 'bbff7ed44b353ff299b900a1ff50812a082206f0':
DO NOT MERGE : Ensure that the first post-restore backup pass is correct
2011-01-25 15:51:54 -08:00
Chris Tate
03ae0c7c05
am 6ec91731: (-s ours) DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores
...
* commit '6ec91731cbf6ee1a9a914d341fab9567d1599018':
DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
2011-01-25 15:51:30 -08:00
Dianne Hackborn
eac3793473
am 433863b1: Fix issue #3333958 : Package Manager can sometimes mistakenly think...
...
* commit '433863b1085248a8fdc9bcd0ac8501cc6a7b8ace':
Fix issue #3333958 : Package Manager can sometimes mistakenly think...
2011-01-25 15:51:08 -08:00
Dianne Hackborn
3c952113eb
am cd23823d: Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread
...
* commit 'cd23823d4f533431c76baa104eb50b7803b3b391':
2011-01-25 15:50:44 -08:00
Scott Main
d650db32ac
am 9b447d12: (-s ours) docs: catchup gingerbread to gingerbread-docs with misc changes
...
* commit '9b447d122a2f0a4798f03749e9d93b9a58834fe3':
docs: catchup gingerbread to gingerbread-docs with misc changes
2011-01-25 15:45:58 -08:00
Scott Main
d34c0c981a
am 3d0f0108: cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
...
* commit '3d0f0108f9487512195c7344be2417c30a93c3fc':
cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
2011-01-25 15:36:41 -08:00
Scott Main
0778f7d418
am c5602aee: fix bug 3295540
...
* commit 'c5602aeea3f4962dcb66d7a9e4a733259d5c12d5':
fix bug 3295540
2011-01-25 15:36:17 -08:00
Yu Shan Emily Lau
1460084987
am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread
...
* commit '2af4e71dd47565d794ad48041a156871396a7dde':
Fix the test application orientation. Bug# 3205196
2011-01-25 15:21:41 -08:00
Gilles Debunne
213b0f7514
am 9ffb0a0d: (-s ours) Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread
...
* commit '9ffb0a0df3a97115234bd50a73ca60efcefb4ef7':
Ran fixPngMetaTags on all the core/res assets.
2011-01-25 15:20:38 -08:00
Gilles Debunne
7832d65d38
am 97664784: (-s ours) Merge "Asset cleanup. DO NOT MERGE" into gingerbread
...
* commit '976647841cc9e52c373679c930d06d81310ff289':
Asset cleanup. DO NOT MERGE
2011-01-25 14:58:31 -08:00
Marco Nelissen
5cc9435b07
am f13d4501: (-s ours) Send "compilation" tag when inserting into the database. It\'s not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831
...
* commit 'f13d4501396aa1679004ad07d440f65ced3ecc2b':
Send "compilation" tag when inserting into the database. It's not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831
2011-01-25 14:58:08 -08:00
Marco Nelissen
36852b113f
am ba77a3f9: (-s ours) Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
...
* commit 'ba77a3f9cb1d68b2ed4813aaae856444578e3a75':
Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
2011-01-25 12:51:41 -08:00
Nick Pelly
59b1ef13c3
am f54ad8da: Clean up transceive().
...
* commit 'f54ad8daf6f9dc2b9670ab1abbbfa4308b40bc6a':
Clean up transceive().
2011-01-25 12:39:25 -08:00
Eric Fischer
ff2b6df293
am 06d19ef0: (-s ours) Merge "Import translations for additional languages." into gingerbread
...
* commit '06d19ef0a0f29d9a0bec63097ec443815512e9b1':
Import translations for additional languages.
2011-01-25 12:39:03 -08:00
Jeff Hamilton
35d264eed9
resolved conflicts for merge of 0aea1836 to honeycomb-merge
...
Change-Id: I5aa17ff6dc9037815c3ec3e6e4b18183aedbbdf2
2011-01-25 14:35:55 -06:00
Dianne Hackborn
9113f0463b
am 3ea5728e: Tweak level at which we reset battery stats to 90%.
...
* commit '3ea5728e703554f8ba0bb3aa1367d6dc45d704bb':
Tweak level at which we reset battery stats to 90%.
2011-01-25 10:45:33 -08:00
Adam Powell
8ec254230e
Merge "Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon" into honeycomb
2011-01-24 14:23:36 -08:00
Andreas Huber
f22700aad0
Merge "Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder" into honeycomb
2011-01-24 13:57:11 -08:00
Eric Fischer
fb2c634139
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-24 13:46:28 -08:00
Andreas Huber
622ed4bf67
Merge "The .mkv parser lib leaves some tracks NULL if it doesn't support them." into honeycomb
2011-01-24 13:29:58 -08:00
Huahui Wu
ac74723924
Merge "A few small cleanning-ups." into honeycomb
2011-01-24 13:25:17 -08:00
Daniel Sandler
fb85e51e1c
Merge "Vertically align SSID/PLMN on lockscreen." into honeycomb
2011-01-24 13:14:35 -08:00
Justin Ho
3050e3c0b8
Merge "Updated checkbox assets for legacy applications" into honeycomb
2011-01-24 12:55:29 -08:00
Andreas Huber
071e5d38da
Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (again)" into honeycomb
2011-01-24 10:45:59 -08:00
Santosh Madhava
f71c66d2b4
Merge "Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'" into honeycomb
2011-01-24 10:45:36 -08:00
Joe Onorato
946566e14b
Merge "Remove unwanted parameter (it was a typo)." into honeycomb
2011-01-24 10:43:55 -08:00
Chet Haase
b65ef09bc6
Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb
2011-01-24 09:24:59 -08:00
Daniel Sandler
0adceefce0
Merge "Smoothly hide the list when there are no notifications." into honeycomb
2011-01-24 08:59:08 -08:00
Gilles Debunne
7637510357
Merge "New fix for popup behavior in AutoCompleteTextViews." into honeycomb
2011-01-24 08:58:07 -08:00
Chet Haase
47ab362e8d
Use optimized display lists for all hwaccelerated rendering
...
Previously, display lists were used only if hardware acceleration
was enabled for an application (hardwareAccelerated=true) *and* if
setDrawingCacheEnabled(true) was called. This change makes the framework
use display lists for all views in an application if hardware acceleration
is enabled.
In addition, display list renderering has been optimized so that
any view's recreation of its own display list (which is necessary whenever
the visuals of that view change) will not cause any other display list
in its parent hierarchy to change. Instead, when there are any visual
changes in the hierarchy, only those views which need to have new
display list content will recreate their display lists.
This optimization works by caching display list references in each
parent display list (so the container of some child will refer to its
child's display list by a reference to the child's display list). Then when
a view needs to recreate its display list, it will do so inside the same
display list object. This will cause the content to get refreshed, but not
the reference to that content. Then when the view hierarchy is redrawn,
it will automatically pick up the new content from the old reference.
This optimization will not necessarily improve performance when applications
need to update the entire view hierarchy or redraw the entire screen, but it does
show significant improvements when redrawing only a portion of the screen,
especially when the regions that are not refreshed are complex and time-
consuming to redraw.
Change-Id: I68d21cac6a224a05703070ec85253220cb001eb4
2011-01-24 08:43:20 -08:00
Gil Dobjanschi
cda20d3b7c
Merge "VideoEditor:Clear Surface API addition" into honeycomb
2011-01-23 22:32:28 -08:00
Dianne Hackborn
295c34358b
Merge "Fix a regression in the wallpaper drawing." into honeycomb
2011-01-23 22:12:39 -08:00
Adam Powell
03fbc7495d
Merge "Fix bug 3360953 - Toasts use the holo theme in non-HC apps" into honeycomb
2011-01-23 22:00:29 -08:00
Adam Powell
964697ccf9
Merge "Fix bug 3381275 - Too much padding on the left of a custom nav bar" into honeycomb
2011-01-23 20:52:38 -08:00
Joe Onorato
9dcb68a4e2
Merge "visibility ("lights out") API." into honeycomb
2011-01-23 19:26:13 -08:00
Joe Onorato
16c415a62b
Merge "Fix typo that causes brigtness to be wrong." into honeycomb
2011-01-23 18:26:02 -08:00
Adam Powell
86d494ddf5
Merge "Fix bug 3380292 - long title in actionbar context mode pushes buttons over edge" into honeycomb
2011-01-23 18:16:09 -08:00
Dianne Hackborn
e9650dfaf8
Merge "Fix issue #3215261 : NPE in WiFi Settings" into honeycomb
2011-01-23 17:45:59 -08:00
Adam Powell
34c204773b
Merge "Fix bug 3381563 - fix segmented button styles" into honeycomb
2011-01-23 17:07:59 -08:00
Jim Miller
9676003b5e
Merge "Fix 3373106: add hint text to PasswordUnlock" into honeycomb
2011-01-23 17:06:42 -08:00
Jesse Wilson
8965f7d951
Merge "Don't call broken+deprecated SamplingProfiler.writeHprofData" into honeycomb
2011-01-23 16:40:53 -08:00
Romain Guy
1b8daa9929
Merge "Fix bitmap meshes to work in display lists." into honeycomb
2011-01-23 16:34:08 -08:00
Dianne Hackborn
7366fb7b39
Merge "aapt: Allow raw "%" in unformatted string-arrays" into honeycomb
2011-01-23 16:30:53 -08:00
Romain Guy
57abff98cf
Merge "Add support for arcs." into honeycomb
2011-01-23 16:12:50 -08:00
Adam Powell
3e76ac990b
Merge "Fix bug 3299208 - Some apps' dialogs aren't show()ing successfully" into honeycomb
2011-01-23 16:09:54 -08:00
Dianne Hackborn
ddbdf97920
Merge "Final (hopefully) API cleanup." into honeycomb
2011-01-23 14:48:09 -08:00
Romain Guy
759569c0c4
Merge "Add support for ovals and stroked rectangles." into honeycomb
2011-01-23 14:17:28 -08:00
Dan Morrill
9230c9b3ff
Merge "Adding faketouch feature." into honeycomb
2011-01-23 14:17:18 -08:00