Chris Tate
b14abaa352
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
f90b221ab1
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
692d313ef7
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
49c60e2f58
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
6a41b4cc77
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
8d6ad873b0
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
2b0ec4fe04
am c5602aee: fix bug 3295540
...
* commit 'c5602aeea3f4962dcb66d7a9e4a733259d5c12d5':
fix bug 3295540
2011-01-25 15:36:17 -08:00
Yu Shan Emily Lau
18bb1ce02f
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
303ecb9217
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
b61da08ce1
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
db791574e9
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
7fffccddae
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
0c57adce34
am f54ad8da: Clean up transceive().
...
* commit 'f54ad8daf6f9dc2b9670ab1abbbfa4308b40bc6a':
Clean up transceive().
2011-01-25 12:39:25 -08:00
Eric Fischer
88fb11dee5
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
4f1b04ac47
resolved conflicts for merge of 0aea1836 to honeycomb-merge
...
Change-Id: I5aa17ff6dc9037815c3ec3e6e4b18183aedbbdf2
2011-01-25 14:35:55 -06:00
Dianne Hackborn
93dd6a6ad1
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
bffb0a2586
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
Adam Powell
abbcc241c0
Fix bug 3237638 - make it easy to change a "refresh" AB button/icon
...
into the indeterminate progress icon
This fixes a bug that caused ActionViews to not be updated properly
after a pass through invalidateOptionsMenu/onPrepareOptionsMenu. Apps
can now set/clear action views to display progress spinner widgets or
anything else on demand.
Change-Id: I138eceb504177c6bb5b86d40a68a82973aa841a5
2011-01-24 14:03:16 -08:00
Andreas Huber
bc5172fe66
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
f7358996d3
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-24 13:46:28 -08:00
Andreas Huber
a8385dd7c1
Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
...
Change-Id: Ia22ebce66d9c35de4b04c3eedc9495847796901d
related-to-bug: 3384367
2011-01-24 13:36:30 -08:00
Andreas Huber
c45d3ad084
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
94b8b114ab
Merge "A few small cleanning-ups." into honeycomb
2011-01-24 13:25:17 -08:00
Daniel Sandler
1e25a23f9d
Merge "Vertically align SSID/PLMN on lockscreen." into honeycomb
2011-01-24 13:14:35 -08:00
Justin Ho
7040e33c18
Merge "Updated checkbox assets for legacy applications" into honeycomb
2011-01-24 12:55:29 -08:00
Daniel Sandler
bfa8983b65
Vertically align SSID/PLMN on lockscreen.
...
Bug: 3373818
Change-Id: Ie20584c5247bd52e376ddcb97205ba967ce3a8ea
2011-01-24 15:52:46 -05:00
Andreas Huber
dfe8d9b1ff
The .mkv parser lib leaves some tracks NULL if it doesn't support them.
...
But it still counts them as valid tracks...
Change-Id: I77e8fd24cce91a586e8e418759db55b6eba449c0
related-to-bug: 3377186
2011-01-24 12:46:12 -08:00
Eric Fischer
a1a8d941c2
Import revised translations. DO NOT MERGE
...
Change-Id: I4babd2856874af87e991dab0f5c9696e54ca49b4
2011-01-24 12:35:32 -08:00
Huahui Wu
f93246923f
A few small cleanning-ups.
...
1. Remove mDeferMultiTouch in WebView, it was for testing only but
we don't need it now since we always pass MultiTouch to WebKit.
2. Remove the use of mDeferMultiTouch in DRT tests.
3. Correct the index of getX(Y) for the second touch point in the
debug string of MotionEvent.
Change-Id: Ib63cfc5935af1a169ed26b2b138f74908492bc18
2011-01-24 12:07:37 -08:00
Justin Ho
ec42272205
Updated checkbox assets for legacy applications
...
Change-Id: I30c39101b365a0bcc78e1b5ff67a9d2ae732e5ae
2011-01-24 12:07:37 -08:00
Andreas Huber
da6f929584
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
3648691259
Merge "Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'" into honeycomb
2011-01-24 10:45:36 -08:00
Joe Onorato
da34e13bb4
Merge "Remove unwanted parameter (it was a typo)." into honeycomb
2011-01-24 10:43:55 -08:00
Andreas Huber
aac2e9e156
Make AwesomePlayer's reset process more verbose to track down ANRs (again)
...
Change-Id: I0d66994cc4295fd5ceeaaf151ce913ed0dd995f9
related-to-bug: 3362836
2011-01-24 10:31:52 -08:00
Santosh Madhava
4ff8a0b410
Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'
...
Change-Id: Id2e4598f29191c506ab99a112bd7743f6a794cd6
2011-01-24 10:17:05 -08:00
Joe Onorato
e595cad6ee
Remove unwanted parameter (it was a typo).
...
Bug: 3241144
Change-Id: I569f6c8dffb17041a422be6084b6eab89624a57b
2011-01-24 09:25:35 -08:00
Chet Haase
67005b05cc
Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb
2011-01-24 09:24:59 -08:00
Daniel Sandler
78b32fc451
Merge "Smoothly hide the list when there are no notifications." into honeycomb
2011-01-24 08:59:08 -08:00
Gilles Debunne
7108724d4b
Merge "New fix for popup behavior in AutoCompleteTextViews." into honeycomb
2011-01-24 08:58:07 -08:00
Chet Haase
daf98e941e
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
satok
57ffc00239
Add a way that subtype will be excluded from a last input method
...
Bug: 3382702
- Added SUBTYPE_EXTRAVALUE_EXCLUDE_FROM_LAST_IME and if subtype has this extra value,
It will be excluded from a last input method which will be called from switchToLastInputMethod
Change-Id: I03ae10e07f978dcc3a83dd77b10613048dce7f22
2011-01-25 00:52:53 +09:00
Gil Dobjanschi
9c265fcc84
Merge "VideoEditor:Clear Surface API addition" into honeycomb
2011-01-23 22:32:28 -08:00
Dianne Hackborn
582a3944f7
Merge "Fix a regression in the wallpaper drawing." into honeycomb
2011-01-23 22:12:39 -08:00
Jeff Brown
033f63a1a5
Fix a regression in the wallpaper drawing.
...
We should not lock and post the surface if we don't intend to
draw anything into it.
Change-Id: Idfd1cf127bdc1f5e1f5e783a8991d44de90878da
2011-01-23 22:01:49 -08:00
Adam Powell
77ddb02620
Merge "Fix bug 3360953 - Toasts use the holo theme in non-HC apps" into honeycomb
2011-01-23 22:00:29 -08:00
Dheeraj Sharma
05d9f81bd6
VideoEditor:Clear Surface API addition
...
Change-Id: I824c4a9d7f0a11ad60f8045eccc8b6139b66af22
2011-01-23 21:41:34 -08:00
Adam Powell
472b026dc1
Fix bug 3360953 - Toasts use the holo theme in non-HC apps
...
Change-Id: Ic386b35ec47613655f4b17395090959f9031e3ad
2011-01-23 21:15:23 -08:00
Adam Powell
a6ce081970
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
Adam Powell
2a7ea67a03
Fix bug 3381275 - Too much padding on the left of a custom nav bar
...
Hide the title layout if it's empty to omit any included padding.
Change-Id: I01d287c8e214ed3648a47f5ca00b50f78d1659ad
2011-01-23 20:35:28 -08:00
Joe Onorato
4c541b1303
Merge "visibility ("lights out") API." into honeycomb
2011-01-23 19:26:13 -08:00