OSDN Git Service
Svetoslav Ganov [Tue, 1 Feb 2011 00:37:05 +0000 (16:37 -0800)]
Clean up of the DatePicker
1. Removed a duplicate DatePicker stylable.
2. Fixed a bug that if the user wrongly desires to have the
calendar view and spinners hidden despite that DataPicker
ovrrides such incorrect choice to show at least the spinners
the min adn max date attributes are igonored.
Change-Id: I6307db71aca837ad790aea59fa70ead393feb066
Mike Lockwood [Mon, 31 Jan 2011 22:13:30 +0000 (14:13 -0800)]
Merge "MTP: Use ro.product.manufacturer system property value for MTP manufacturer name"
Mike Lockwood [Mon, 31 Jan 2011 21:44:44 +0000 (16:44 -0500)]
MTP: Use ro.product.manufacturer system property value for MTP manufacturer name
Previously it was hard coded to "Google, Inc."
BUG:
3405965
Change-Id: I5f962d474814c22e990c39b501c0f01da9e8dc6d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Alex Sakhartchouk [Fri, 28 Jan 2011 17:31:47 +0000 (09:31 -0800)]
Making sure we can build libRS on the host for serialization.
Change-Id: If0a5d77b20c0e1e2d124fa0737643a5dd1d4409a
Daniel Sandler [Mon, 31 Jan 2011 19:54:05 +0000 (11:54 -0800)]
am
f4fc099c: am
4f63da64: Merge "Alignment in the title area of the notification panel." into honeycomb
* commit '
f4fc099c55ddd7d5c2e28a8b0a7d482b5082e27d':
Alignment in the title area of the notification panel.
Daniel Sandler [Mon, 31 Jan 2011 19:49:03 +0000 (11:49 -0800)]
am
4f63da64: Merge "Alignment in the title area of the notification panel." into honeycomb
* commit '
4f63da64d82131388ff02586e5fe19662fe641de':
Alignment in the title area of the notification panel.
Daniel Sandler [Mon, 31 Jan 2011 19:46:57 +0000 (11:46 -0800)]
Merge "Alignment in the title area of the notification panel." into honeycomb
Joe Onorato [Mon, 31 Jan 2011 19:28:35 +0000 (11:28 -0800)]
am
19a02219: am
fe6fd242: Merge "Mask out the non public bits, not the public ones." into honeycomb
* commit '
19a022194d0e049759112a743835af323f4b05a1':
Mask out the non public bits, not the public ones.
Joe Onorato [Mon, 31 Jan 2011 19:26:51 +0000 (11:26 -0800)]
am
fe6fd242: Merge "Mask out the non public bits, not the public ones." into honeycomb
* commit '
fe6fd242867022576a99fcd5fd6078fb7bab8451':
Mask out the non public bits, not the public ones.
Joe Onorato [Mon, 31 Jan 2011 19:25:06 +0000 (11:25 -0800)]
Merge "Mask out the non public bits, not the public ones." into honeycomb
Joe Onorato [Mon, 31 Jan 2011 19:21:10 +0000 (11:21 -0800)]
Mask out the non public bits, not the public ones.
Bug:
3406103
Change-Id: I44b16700567cb2bf76efe9e8c1f9c82d0eaa8f10
Gilles Debunne [Mon, 31 Jan 2011 19:16:16 +0000 (11:16 -0800)]
am
85ebed39: am
ccfcd9e8: Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
* commit '
85ebed39e4b7710b56e25d10038172dde12ef7b0':
Fxi initial error popup dialog in TextEdit and refreshed assets.
Gilles Debunne [Mon, 31 Jan 2011 19:13:24 +0000 (11:13 -0800)]
am
ccfcd9e8: Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
* commit '
ccfcd9e813d090ec9b4390b5217b32f73dd8263d':
Fxi initial error popup dialog in TextEdit and refreshed assets.
Gilles Debunne [Mon, 31 Jan 2011 19:10:53 +0000 (11:10 -0800)]
Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
Jeff Hamilton [Mon, 31 Jan 2011 19:07:50 +0000 (11:07 -0800)]
am
737fe548: (-s ours) am
ddd11292: Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb
* commit '
737fe5480f3e5029c298eb3b4c8efb870484cefd':
Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE
Jeff Hamilton [Mon, 31 Jan 2011 19:03:50 +0000 (11:03 -0800)]
am
ddd11292: Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb
* commit '
ddd11292d1be8d33989e3a67bf6398464ef2632c':
Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE
Jeff Hamilton [Mon, 31 Jan 2011 19:01:07 +0000 (11:01 -0800)]
Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb
Daniel Sandler [Mon, 31 Jan 2011 18:38:06 +0000 (13:38 -0500)]
Alignment in the title area of the notification panel.
Clock size -> 78sp to match specs
Clock right pad -> 6dp to achieve 14dp escapement
Bug:
3400754
Change-Id: I04a56aa899ab55804ad034ed06d9c7aaad331bc0
Jeff Hamilton [Mon, 31 Jan 2011 18:14:28 +0000 (10:14 -0800)]
am
1d04981f: am
f7176dfb: am
113834c5: Commit the final API for level 10.
* commit '
1d04981fb2a484212ddb4ffb599e682ed2a9680d':
Commit the final API for level 10.
Jeff Hamilton [Mon, 31 Jan 2011 18:11:46 +0000 (10:11 -0800)]
am
f7176dfb: am
113834c5: Commit the final API for level 10.
* commit '
f7176dfbd284f7da49e5bccc2aa886b42039ba4a':
Commit the final API for level 10.
Jeff Hamilton [Mon, 31 Jan 2011 18:05:13 +0000 (10:05 -0800)]
am
113834c5: Commit the final API for level 10.
* commit '
113834c5ab30bfc554202d0f3144a662d77f2484':
Commit the final API for level 10.
Jeff Hamilton [Mon, 31 Jan 2011 17:46:29 +0000 (11:46 -0600)]
Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE
Change-Id: If1d1ff69a6f3e80796d68ec5dbfa722adce23d40
Jeff Hamilton [Mon, 31 Jan 2011 17:46:29 +0000 (11:46 -0600)]
Commit the final API for level 10.
Change-Id: I56140f79ff599c1a9d03c0f53d700df402234bf1
Daniel Sandler [Mon, 31 Jan 2011 17:11:03 +0000 (09:11 -0800)]
am
c05ddc11: am
cb9d4d28: Merge "Kill spurious animations when vetoing notifications." into honeycomb
* commit '
c05ddc111f619d3fa34dcd72ac33d68e6cba0eb8':
Kill spurious animations when vetoing notifications.
Daniel Sandler [Mon, 31 Jan 2011 17:08:00 +0000 (09:08 -0800)]
am
cb9d4d28: Merge "Kill spurious animations when vetoing notifications." into honeycomb
* commit '
cb9d4d28be41c72a8c6f254bf8fdaac5f41e0b6f':
Kill spurious animations when vetoing notifications.
Daniel Sandler [Mon, 31 Jan 2011 17:04:32 +0000 (09:04 -0800)]
Merge "Kill spurious animations when vetoing notifications." into honeycomb
Tadashi G. Takaoka [Mon, 31 Jan 2011 16:51:27 +0000 (08:51 -0800)]
am
ed670b8b: am
81f4b582: Merge "Fix hardware keyboard switch listener" into honeycomb
* commit '
ed670b8b25a6cca95d4cdbd01940bb65d8026586':
Fix hardware keyboard switch listener
Tadashi G. Takaoka [Mon, 31 Jan 2011 16:49:30 +0000 (08:49 -0800)]
am
81f4b582: Merge "Fix hardware keyboard switch listener" into honeycomb
* commit '
81f4b582d4f3547bcd432da6bcb21d4ef414723d':
Fix hardware keyboard switch listener
Tadashi G. Takaoka [Mon, 31 Jan 2011 16:47:12 +0000 (08:47 -0800)]
Merge "Fix hardware keyboard switch listener" into honeycomb
Leon Scroggins [Mon, 31 Jan 2011 16:26:35 +0000 (08:26 -0800)]
am
5592f0b1: am
22e883dd: For Textareas, do not use UI side layers.
* commit '
5592f0b16e44515a3e3686fd417cc1945b83c764':
For Textareas, do not use UI side layers.
Leon Scroggins [Mon, 31 Jan 2011 16:24:31 +0000 (08:24 -0800)]
am
22e883dd: For Textareas, do not use UI side layers.
* commit '
22e883dd4a400122003506f47b228378000dd12f':
For Textareas, do not use UI side layers.
Tadashi G. Takaoka [Mon, 31 Jan 2011 09:39:27 +0000 (18:39 +0900)]
Fix hardware keyboard switch listener
Bug:
3391067
Change-Id: I64ae55652afedee60a70bc140cfb328b04bc8c83
Leon Scroggins [Mon, 31 Jan 2011 15:54:19 +0000 (10:54 -0500)]
For Textareas, do not use UI side layers.
Bug:
3402831
Bug:
3401242
Requires a change in external/webkit.
Change-Id: I391d9133b3953d213520cbba5ed49b11ebeaef2d
Gil Dobjanschi [Mon, 31 Jan 2011 12:16:16 +0000 (04:16 -0800)]
am
1aa865aa: am
2bb13573: Bug fix:
3405930 Crash editing overlay text
* commit '
1aa865aae054de0f5f2cb6ee58a6b93ad4d0f673':
Bug fix:
3405930 Crash editing overlay text
Gil Dobjanschi [Mon, 31 Jan 2011 12:13:06 +0000 (04:13 -0800)]
am
2bb13573: Bug fix:
3405930 Crash editing overlay text
* commit '
2bb13573d619e3371d06847d36db78a20b17dfab':
Bug fix:
3405930 Crash editing overlay text
Gil Dobjanschi [Mon, 31 Jan 2011 09:16:32 +0000 (01:16 -0800)]
Bug fix:
3405930 Crash editing overlay text
Change-Id: Icd304ef8dde2b41812b14857dc3c112cc22d578e
Wink Saville [Mon, 31 Jan 2011 07:17:35 +0000 (23:17 -0800)]
am
bac75416: am
cde85d57: Merge "Add debug for tracking bug
3404006." into honeycomb
* commit '
bac75416d1cead62ca54e6e78206da64507146ba':
Add debug for tracking bug
3404006.
Wink Saville [Mon, 31 Jan 2011 07:14:39 +0000 (23:14 -0800)]
am
cde85d57: Merge "Add debug for tracking bug
3404006." into honeycomb
* commit '
cde85d573873adce9ebcf0d2c4c2c5c1b8d465cc':
Add debug for tracking bug
3404006.
Wink Saville [Mon, 31 Jan 2011 07:12:35 +0000 (23:12 -0800)]
Merge "Add debug for tracking bug
3404006." into honeycomb
Bart Sears [Mon, 31 Jan 2011 04:11:06 +0000 (20:11 -0800)]
am
5a773713: am
e3004e78: New DroidSansFallback font file from Ascender
* commit '
5a7737138ec2536faa931df8059509fd36e2e63f':
New DroidSansFallback font file from Ascender
Bart Sears [Mon, 31 Jan 2011 04:08:13 +0000 (20:08 -0800)]
am
e3004e78: New DroidSansFallback font file from Ascender
* commit '
e3004e7867925e70bf4930384a265106f45f87d6':
New DroidSansFallback font file from Ascender
Bart Sears [Mon, 31 Jan 2011 03:59:02 +0000 (19:59 -0800)]
New DroidSansFallback font file from Ascender
Bug:
3315583
1) IPA (U+0250-U+02AF)
2) Currency symbols
3) U+02BB MODIFIER LETTER TURNED COMMA
4) Non-breaking hyphen ("\u2011")
5) Jamo U+11xx mappings
Change-Id: Ie4dfc7677d0f63c89ed0e1f6506cd513ae45ffa9
Daniel Sandler [Mon, 31 Jan 2011 02:26:24 +0000 (21:26 -0500)]
Kill spurious animations when vetoing notifications.
Bug:
3406032
Change-Id: I6da6ee064d309bc44f6304722c5f3f4e05aaf687
Dheeraj Sharma [Mon, 31 Jan 2011 02:18:43 +0000 (18:18 -0800)]
am
60a3ead5: am
cd73d1ed: Merge "Fix for issue
3404671 Crash when exporting movie in JNI" into honeycomb
* commit '
60a3ead52ec6216b28d1d82ab3480a08bf919c17':
Fix for issue
3404671 Crash when exporting movie in JNI
Dheeraj Sharma [Mon, 31 Jan 2011 02:14:40 +0000 (18:14 -0800)]
am
cd73d1ed: Merge "Fix for issue
3404671 Crash when exporting movie in JNI" into honeycomb
* commit '
cd73d1ed6d1149a2ae642e87ffe8d89100fbafec':
Fix for issue
3404671 Crash when exporting movie in JNI
Dheeraj Sharma [Mon, 31 Jan 2011 02:12:25 +0000 (18:12 -0800)]
Merge "Fix for issue
3404671 Crash when exporting movie in JNI" into honeycomb
Dianne Hackborn [Mon, 31 Jan 2011 02:08:12 +0000 (18:08 -0800)]
am
97510f6a: am
260c3c77: Fix issue #
3381489: IllegalStateException: attempt to re-open...
* commit '
97510f6abda493119cbf7db84064291a7edacfc0':
Fix issue #
3381489: IllegalStateException: attempt to re-open...
Dianne Hackborn [Mon, 31 Jan 2011 02:05:08 +0000 (18:05 -0800)]
am
260c3c77: Fix issue #
3381489: IllegalStateException: attempt to re-open...
* commit '
260c3c77d9b340164e055f87002c64d78da6e836':
Fix issue #
3381489: IllegalStateException: attempt to re-open...
Joe Onorato [Mon, 31 Jan 2011 02:01:47 +0000 (18:01 -0800)]
am
0bab356f: am
fba54f62: Merge "I declare settings panel icon VICTORY!" into honeycomb
* commit '
0bab356fd87a973933ad69a30a400571a8394f0b':
I declare settings panel icon VICTORY!
Dianne Hackborn [Mon, 31 Jan 2011 00:55:55 +0000 (16:55 -0800)]
Fix issue #
3381489: IllegalStateException: attempt to re-open...
...an already-closed object: android.database.sqlite.SQLiteQuery
It turns out there is a state we are missing -- the loader is
still needed, but in the inactive list. In this case the loader
needs to continue holding on to its current data, and not deliver
any new data (which would result in it releasing its old data).
This introduces the new state to Loader, and uses it in
AsyncTaskLoader so all subclasses of that should get the new
correct behavior.
A further improvement would be to unregister CursorLoader's
content listener when going in to this state, but that can
wait for later.
Change-Id: I6d30173b94f8e30b5be31d018accd328cc3388ec
Joe Onorato [Mon, 31 Jan 2011 01:58:47 +0000 (17:58 -0800)]
am
fba54f62: Merge "I declare settings panel icon VICTORY!" into honeycomb
* commit '
fba54f620ff155ede6de7d73f1b6a0003839b1c4':
I declare settings panel icon VICTORY!
Joe Onorato [Mon, 31 Jan 2011 01:56:25 +0000 (17:56 -0800)]
Merge "I declare settings panel icon VICTORY!" into honeycomb
Joe Onorato [Mon, 31 Jan 2011 01:46:32 +0000 (17:46 -0800)]
I declare settings panel icon VICTORY!
Bug:
3396115
Change-Id: I72c46361506ec48bf3ebc9b84dbc476c301ce20c
John Reck [Mon, 31 Jan 2011 01:30:17 +0000 (17:30 -0800)]
am
a4b23164: am
13934c2d: Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
* commit '
a4b23164167c571e6d22c3486105fdef17ff8e4a':
Prevent SET_SCROLL_OFFSET spam from clogging tubes
John Reck [Mon, 31 Jan 2011 01:12:29 +0000 (17:12 -0800)]
am
13934c2d: Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
* commit '
13934c2d71046cdd2e7ca33528b91cb83f82dc13':
Prevent SET_SCROLL_OFFSET spam from clogging tubes
John Reck [Mon, 31 Jan 2011 00:55:23 +0000 (16:55 -0800)]
Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
Dharmaray Kundargi [Mon, 31 Jan 2011 00:37:44 +0000 (16:37 -0800)]
am
0cc515b4: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
* commit '
0cc515b4adf060df0a9c1b07223389f9b73afb55':
Dharmaray Kundargi [Mon, 31 Jan 2011 00:37:41 +0000 (16:37 -0800)]
am
75aa290d: am
ff843254: Merge "Merging the same files on top of tree." into honeycomb
* commit '
75aa290d5d23a9bb862e409f9b5de23a0ffda579':
Merging the same files on top of tree.
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:35:27 +0000 (16:35 -0800)]
am
ec2cd74e: am
1314bdb2: am
e88fa50b: Merge from open-source gingerbread
* commit '
ec2cd74ee3d43f6d1e6865bf8e576b4b42635a86':
fix failing thread object run
Dharmaray Kundargi [Mon, 31 Jan 2011 00:35:08 +0000 (16:35 -0800)]
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
Dharmaray Kundargi [Mon, 31 Jan 2011 00:35:03 +0000 (16:35 -0800)]
am
ff843254: Merge "Merging the same files on top of tree." into honeycomb
* commit '
ff8432548eb96655190486ee0f0fa08de5451e66':
Merging the same files on top of tree.
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:34:56 +0000 (16:34 -0800)]
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:32:44 +0000 (16:32 -0800)]
am
1314bdb2: am
e88fa50b: Merge from open-source gingerbread
* commit '
1314bdb2b22ae3613c3e08ae278dbc70f90b965c':
fix failing thread object run
Dharmaray Kundargi [Mon, 31 Jan 2011 00:32:07 +0000 (16:32 -0800)]
Merge "Merging the same files on top of tree." into honeycomb
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:26:18 +0000 (16:26 -0800)]
John Reck [Mon, 31 Jan 2011 00:23:09 +0000 (16:23 -0800)]
Prevent SET_SCROLL_OFFSET spam from clogging tubes
Bug:
3393571
Limit the event queue to a single pending SET_SCROLL_OFFSET. The
problem on slashdot.org was that the event thread was being flooded
with SET_SCROLL_OFFSET messages faster than it could process them,
causing the handler to get jammed up.
Change-Id: Ia4a90a030959d0b3769067791089cdb261ae403a
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:19:59 +0000 (16:19 -0800)]
am
e88fa50b: Merge from open-source gingerbread
* commit '
e88fa50be8d6709ef58b7aeb01c5efa059bcac2e':
fix failing thread object run
Adam Powell [Mon, 31 Jan 2011 00:17:59 +0000 (16:17 -0800)]
am
853f284c: am
c9cb3083: Merge "Fix bug
3405899 - android.view.WindowManager" into honeycomb
* commit '
853f284c0b80540cf447af0e6e704d7a05947efd':
Fix bug
3405899 - android.view.WindowManager$BadTokenException
Dharmaray Kundargi [Sun, 30 Jan 2011 04:48:05 +0000 (20:48 -0800)]
Merging the same files on top of tree.
Add support for .m4v Issue
3395600
Change-Id: Idca673859afb3398d4b91aba9c20c37396c4f757
Wink Saville [Mon, 31 Jan 2011 00:16:20 +0000 (16:16 -0800)]
Add debug for tracking bug
3404006.
We need some additional debugging to help diagnose the cause
of this bug. There is no logic changes just additional debugging.
Change-Id: Ifc5d1c82904042fa87fd3b5b1066f58b62e7359c
Dianne Hackborn [Mon, 31 Jan 2011 00:15:13 +0000 (16:15 -0800)]
am
9e3754ff: am
54ad3611: Merge "Fix issue #
3404571: Commit final APIs" into honeycomb
* commit '
9e3754ff6dcc81c43708ce0e13c75de836173f64':
Fix issue #
3404571: Commit final APIs
Adam Powell [Mon, 31 Jan 2011 00:14:54 +0000 (16:14 -0800)]
am
c9cb3083: Merge "Fix bug
3405899 - android.view.WindowManager" into honeycomb
* commit '
c9cb30837116b138a91b251e5217a644231eebef':
Fix bug
3405899 - android.view.WindowManager$BadTokenException
Adam Powell [Mon, 31 Jan 2011 00:12:56 +0000 (16:12 -0800)]
Merge "Fix bug
3405899 - android.view.WindowManager$BadTokenException" into honeycomb
Dianne Hackborn [Mon, 31 Jan 2011 00:11:36 +0000 (16:11 -0800)]
am
54ad3611: Merge "Fix issue #
3404571: Commit final APIs" into honeycomb
* commit '
54ad36119460b850641556a12b845eadc9875cb4':
Fix issue #
3404571: Commit final APIs
Joe Onorato [Mon, 31 Jan 2011 00:09:29 +0000 (16:09 -0800)]
am
75057b15: am
4de68bae: Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb
* commit '
75057b1507881625368f76b2f401097b606bd530':
Check for the STATUS_BAR permission for the system UI properties.
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:07:25 +0000 (16:07 -0800)]
am
25503f1c: Merge from gingerbread
* commit '
25503f1c9f0b5f718052b71dc5b21d1c8576d015':
fix failing thread object run
Joe Onorato [Mon, 31 Jan 2011 00:03:59 +0000 (16:03 -0800)]
am
4de68bae: Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb
* commit '
4de68baed4bf18b33dc38f89f25410d3d5edfecf':
Check for the STATUS_BAR permission for the system UI properties.
Dianne Hackborn [Mon, 31 Jan 2011 00:01:36 +0000 (16:01 -0800)]
Merge "Fix issue #
3404571: Commit final APIs" into honeycomb
Joe Onorato [Mon, 31 Jan 2011 00:00:52 +0000 (16:00 -0800)]
Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb
Gilles Debunne [Sun, 30 Jan 2011 23:56:41 +0000 (15:56 -0800)]
am
80a3083f: am
236b9872: Merge "Auto-clearing setError popup" into honeycomb
* commit '
80a3083fdd106b2f839d50e1c861347faa969781':
Auto-clearing setError popup
Gilles Debunne [Sun, 30 Jan 2011 23:53:03 +0000 (15:53 -0800)]
am
236b9872: Merge "Auto-clearing setError popup" into honeycomb
* commit '
236b9872140599d1856d48e53b8e109e506fd88f':
Auto-clearing setError popup
Gilles Debunne [Sun, 30 Jan 2011 23:49:38 +0000 (15:49 -0800)]
Merge "Auto-clearing setError popup" into honeycomb
Adam Powell [Sun, 30 Jan 2011 23:47:29 +0000 (15:47 -0800)]
Fix bug
3405899 - android.view.WindowManager$BadTokenException
Clear any pending runnables involved with TextViews when cursor
controllers are released
Change-Id: I96898fcc237f20d0b0f2351181244cb171fa2083
Joe Onorato [Sun, 30 Jan 2011 23:38:30 +0000 (15:38 -0800)]
Check for the STATUS_BAR permission for the system UI properties.
If the app doesn't have that permission, just mask out the bits.
Also makes the systemUiVisibility field visible in hierarchyviewer.
Change-Id: Ic3d3a3aed96b5c6448832755b4b2e6175117e5be
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:35:06 +0000 (15:35 -0800)]
Merge from gingerbread
Change-Id: I017330e0232b317b8bb54e19ab05874b18c83246
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:29:52 +0000 (15:29 -0800)]
Merge from open-source gingerbread
Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
Dheeraj Sharma [Sun, 30 Jan 2011 23:25:07 +0000 (15:25 -0800)]
am
471ebbca: am
45911e19: Merge "Fix for issue
3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb
* commit '
471ebbca5f404062bed232aa27da9c1f1ebf0a1d':
Fix for issue
3400229 Pan and Zoom effect is not accurate in JAVA and JNI
Dheeraj Sharma [Sun, 30 Jan 2011 23:22:39 +0000 (15:22 -0800)]
am
45911e19: Merge "Fix for issue
3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb
* commit '
45911e1969fd1843bac5806e06f351123b67f596':
Fix for issue
3400229 Pan and Zoom effect is not accurate in JAVA and JNI
Dheeraj Sharma [Sun, 30 Jan 2011 23:20:49 +0000 (15:20 -0800)]
Merge "Fix for issue
3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:17:33 +0000 (15:17 -0800)]
Merge "fix failing thread object run" into gingerbread
Dheeraj Sharma [Sun, 30 Jan 2011 23:13:31 +0000 (15:13 -0800)]
am
bd633b72: am
167e7488: Merge "
3404665 Preview window is blank after returning from playing exported movie" into honeycomb
* commit '
bd633b7297c60771223f0e8799c418cdbce3017c':
3404665 Preview window is blank after returning from playing exported movie
Dheeraj Sharma [Sun, 30 Jan 2011 23:10:25 +0000 (15:10 -0800)]
am
167e7488: Merge "
3404665 Preview window is blank after returning from playing exported movie" into honeycomb
* commit '
167e7488af4d53673ff2fcc0723ae2a1584f5194':
3404665 Preview window is blank after returning from playing exported movie
Dheeraj Sharma [Sun, 30 Jan 2011 23:08:12 +0000 (15:08 -0800)]
Merge "
3404665 Preview window is blank after returning from playing exported movie" into honeycomb
Jamie Gennis [Sun, 30 Jan 2011 23:05:42 +0000 (15:05 -0800)]
am
09443aeb: am
62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb
* commit '
09443aeb6470d66f5bc1938b70d74b3e2f9bbbb9':
Reset ANativeWindow crop on buffer geometry changes.
Jamie Gennis [Sun, 30 Jan 2011 23:03:03 +0000 (15:03 -0800)]
am
62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb
* commit '
628845056282a0c5b1a212ce5aeeaac092b91ec8':
Reset ANativeWindow crop on buffer geometry changes.
Jamie Gennis [Sun, 30 Jan 2011 23:00:44 +0000 (15:00 -0800)]
Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb
Dheeraj Sharma [Sun, 30 Jan 2011 22:52:42 +0000 (14:52 -0800)]
3404665 Preview window is blank after returning from playing exported movie
Change-Id: Idf2719953cbaf41e09eaf86de37e3459a1ea4aed
Vasu Nori [Sun, 30 Jan 2011 22:45:40 +0000 (14:45 -0800)]
Merge "bug:
3385018 don't print finalizer warnings under certain conditions"
Vasu Nori [Sun, 30 Jan 2011 20:47:55 +0000 (12:47 -0800)]
bug:
3385018 don't print finalizer warnings under certain conditions
Change-Id: I06c49a464f61c26d3e6645a95f2dd38d444bf384
Dianne Hackborn [Sat, 29 Jan 2011 22:18:37 +0000 (14:18 -0800)]
Fix issue #
3404571: Commit final APIs
Change-Id: I7f01f8df9cfb82a9bb987e3df7c8eaa1c5aab81a