OSDN Git Service
Mathias Agopian [Tue, 26 Oct 2010 19:23:46 +0000 (12:23 -0700)]
am
d9588e9c: am
a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:19:43 +0000 (12:19 -0700)]
am
a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:18:08 +0000 (12:18 -0700)]
am
f56aac4b: am
d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:18:07 +0000 (12:18 -0700)]
Merge "fix eglChooseConfig() for special attributes." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:16:10 +0000 (12:16 -0700)]
am
d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:14:17 +0000 (12:14 -0700)]
Merge "Add a way to get a string for an error code." into gingerbread
Xavier Ducrohet [Tue, 26 Oct 2010 19:13:32 +0000 (12:13 -0700)]
am
a44a5e02: am
1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread
Xavier Ducrohet [Tue, 26 Oct 2010 19:10:28 +0000 (12:10 -0700)]
am
1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:09:48 +0000 (14:09 -0500)]
Add a way to get a string for an error code.
Change-Id: I133e974c656eb558349cbc3f9a2caf5b18c8fc3d
Xavier Ducrohet [Tue, 26 Oct 2010 19:09:18 +0000 (12:09 -0700)]
Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread
James Dong [Tue, 26 Oct 2010 19:01:39 +0000 (12:01 -0700)]
Merge "Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.java"
Gil Dobjanschi [Tue, 26 Oct 2010 18:50:04 +0000 (11:50 -0700)]
Merge "Effects and overlays are not modified when a video clip is trimmed."
Jaikumar Ganesh [Tue, 26 Oct 2010 18:31:44 +0000 (11:31 -0700)]
Merge "Fix A2DP connection problem, if disconnected while playing music."
James Dong [Tue, 26 Oct 2010 17:56:34 +0000 (10:56 -0700)]
Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.java
Change-Id: Ia464d79d65e43c84937624c5a6fa77c7155cffaa
Patrick Scott [Tue, 26 Oct 2010 18:26:19 +0000 (11:26 -0700)]
Merge "Fix debug statements and aapt assert."
Jaikumar Ganesh [Tue, 26 Oct 2010 18:22:48 +0000 (11:22 -0700)]
Fix A2DP connection problem, if disconnected while playing music.
Change-Id: I594564c11dc1698f00f9db3e6f6e4f8da9e2fe69
Dianne Hackborn [Tue, 26 Oct 2010 18:20:06 +0000 (11:20 -0700)]
Merge "Fix issue #
3130426: Finsky crash in switching from window carousel"
Gilles Debunne [Tue, 26 Oct 2010 18:18:51 +0000 (11:18 -0700)]
Merge "New Holo style for Tabs."
Xavier Ducrohet [Tue, 26 Oct 2010 18:18:39 +0000 (11:18 -0700)]
Fix rendering of digitalClock/Gallery in Eclipse editors.
Change-Id: I80f4f90b173529632eaf2fbc3bb5471b7ede8216
Dianne Hackborn [Tue, 26 Oct 2010 00:08:56 +0000 (17:08 -0700)]
Fix issue #
3130426: Finsky crash in switching from window carousel
Need to note that we no longer have saved state before delivering
results or new intents to an activity.
Also do some work on loaders to prevent apps from making fragment
changes as a result of receiving loader data. This makes apps
consistent crash in a case that they would previously sometimes
crash (if they got the loader data after onPause).
Change-Id: I46e9e46d0aa05d9d7d6a275a2a488a18a20a5747
Gilles Debunne [Tue, 19 Oct 2010 18:56:59 +0000 (11:56 -0700)]
New Holo style for Tabs.
Holo theme with new assets and style for TabWidgets.
Legacy Themes still use GB style.
Assets added in a previous bluk update were removed.
Change-Id: Ia4a612678561fa5047bbd2a72488086c0f3d61a1
Irfan Sheriff [Thu, 21 Oct 2010 23:44:48 +0000 (16:44 -0700)]
add wps pin from device capability
Bug:
3119043
Bug:
3112178
Change-Id: Iaae6bcf53e11f7fac82b3c604ddc27ff05e00542
Patrick Scott [Thu, 21 Oct 2010 18:53:40 +0000 (14:53 -0400)]
Fix debug statements and aapt assert.
ENABLE_PSEUDOLOCALIZE seems to not exist.
Change-Id: Ifef771a96938c7ff0f8b664142bb502030b8c543
Shimeng (Simon) Wang [Tue, 26 Oct 2010 17:05:20 +0000 (10:05 -0700)]
Merge "Fix the viewport height to view height when title bar is visible."
James Dong [Tue, 26 Oct 2010 16:26:24 +0000 (09:26 -0700)]
Merge "Add two creation flags to OMXCodec::Create()"
Justin Ho [Tue, 26 Oct 2010 16:13:08 +0000 (09:13 -0700)]
am
cc8de576: (-s ours) am
5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread
Justin Ho [Tue, 26 Oct 2010 16:11:12 +0000 (09:11 -0700)]
am
5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread
Justin Ho [Tue, 26 Oct 2010 16:09:22 +0000 (09:09 -0700)]
Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread
Justin Ho [Tue, 26 Oct 2010 16:05:06 +0000 (09:05 -0700)]
DO NOT MERGE - Fixing capitalized ringtone metadata only
Change-Id: Ib16ca195356b6cbb3d3926f6d5a3de366eaa980e
Mike Lockwood [Tue, 26 Oct 2010 15:38:51 +0000 (08:38 -0700)]
am
1b571bd3: am
1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread
Mike Lockwood [Tue, 26 Oct 2010 15:36:24 +0000 (08:36 -0700)]
am
1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread
Mike Lockwood [Tue, 26 Oct 2010 15:34:32 +0000 (08:34 -0700)]
Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread
Eric Laurent [Tue, 26 Oct 2010 15:17:07 +0000 (08:17 -0700)]
am
ecae8a43: am
1a58d9c3: Merge "Partial fix for issue
3124895." into gingerbread
Eric Laurent [Tue, 26 Oct 2010 15:14:48 +0000 (08:14 -0700)]
am
1a58d9c3: Merge "Partial fix for issue
3124895." into gingerbread
Eric Laurent [Tue, 26 Oct 2010 15:13:32 +0000 (08:13 -0700)]
Merge "Partial fix for issue
3124895." into gingerbread
Ben Murdoch [Tue, 26 Oct 2010 14:44:34 +0000 (07:44 -0700)]
Merge "Update WebView useragent string for merge to WebKit r70209"
Gil Dobjanschi [Tue, 26 Oct 2010 14:44:00 +0000 (07:44 -0700)]
Effects and overlays are not modified when a video clip is trimmed.
Change-Id: Ib9a54ecab4ea253caa6c64204493fc3f40a6aa53
Jeff Hamilton [Tue, 26 Oct 2010 14:28:57 +0000 (07:28 -0700)]
am
6a49bff5: am
79fb6449: Merge "Make some contructors public but hidden." into gingerbread
Joe Onorato [Tue, 26 Oct 2010 14:28:51 +0000 (07:28 -0700)]
am
a1e74744: am
11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 14:24:57 +0000 (07:24 -0700)]
am
79fb6449: Merge "Make some contructors public but hidden." into gingerbread
Joe Onorato [Tue, 26 Oct 2010 14:24:41 +0000 (07:24 -0700)]
am
11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread
Ben Murdoch [Fri, 22 Oct 2010 12:02:35 +0000 (13:02 +0100)]
Update WebView useragent string for merge to WebKit r70209
Change-Id: I127d530ca027509cd4570f508ce98bc03ddb6a68
Jeff Hamilton [Tue, 26 Oct 2010 14:16:46 +0000 (07:16 -0700)]
Merge "Make some contructors public but hidden." into gingerbread
Mike Lockwood [Tue, 26 Oct 2010 14:01:55 +0000 (10:01 -0400)]
Location Manager: Fix LocationManager.getBestProvider filtering.
getBestProvider should only return location providers that the client
has permission to use.
BUG:
3124614
Change-Id: I065091d0445092563bc53fb4f7d93a1ab6bebb9a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Chet Haase [Tue, 26 Oct 2010 13:59:19 +0000 (06:59 -0700)]
Merge "DisplayList optimizations and fixes."
Jeff Hamilton [Tue, 26 Oct 2010 13:59:18 +0000 (08:59 -0500)]
Make some contructors public but hidden.
This allows them to be used from within the
NFC stack process internally.
Change-Id: I7f81759da63d451efe86550a57a400fb224b2064
Chet Haase [Mon, 25 Oct 2010 22:47:32 +0000 (15:47 -0700)]
DisplayList optimizations and fixes.
We now use a copy of SkPaint objects to avoid having it changed from under us.
We reuse copies that have not changed. We also copy the SkMatrix every time to
avoid the same problem.
Change-Id: If3fd80698f2d43ea16d23302063e0fd8d0549027
Gloria Wang [Tue, 26 Oct 2010 10:31:13 +0000 (03:31 -0700)]
A temporary fix for "Waiting for service drm.drmManager".
Change-Id: I554c9bbec8c63c3c8dbc5b5374614c1101f6d1d9
Jaikumar Ganesh [Tue, 26 Oct 2010 07:32:06 +0000 (00:32 -0700)]
Merge "Add logs to debug incoming A2DP connection issue."
Jaikumar Ganesh [Tue, 26 Oct 2010 07:28:39 +0000 (00:28 -0700)]
Add logs to debug incoming A2DP connection issue.
Change-Id: Ifbdd625ec8dc50544990a1ddbd87284285f3f2d2
Jaikumar Ganesh [Tue, 26 Oct 2010 07:18:31 +0000 (00:18 -0700)]
Merge "Clean up some logging to make it more useful to debug."
Jaikumar Ganesh [Tue, 26 Oct 2010 07:14:04 +0000 (00:14 -0700)]
Clean up some logging to make it more useful to debug.
Change-Id: Ic30210ea6886b1c4630d7671a4b01736512e9da8
Jim Miller [Tue, 26 Oct 2010 03:33:48 +0000 (20:33 -0700)]
Merge "Fix
3117937: Add simplified "recent apps"."
Eric Laurent [Tue, 26 Oct 2010 02:42:08 +0000 (19:42 -0700)]
Partial fix for issue
3124895.
When a SIP call is put on hold and no other call is active, the audio mode should not be
switched to incall.
Change-Id: I1307330f10cbfb9c4223bcb9dc4faa79778750af
Jaikumar Ganesh [Tue, 26 Oct 2010 02:41:57 +0000 (19:41 -0700)]
Merge "Implement ACTION_CONNECTION_STATE_CHANGED intent."
Jack Palevich [Tue, 26 Oct 2010 02:39:20 +0000 (19:39 -0700)]
Merge "Do not exit the GLSurfaceView thread when detached from a window."
Jack Palevich [Tue, 26 Oct 2010 02:38:13 +0000 (19:38 -0700)]
Do not exit the GLSurfaceView thread when detached from a window.
Allows a GLSurfaceView to be removed from a window and later reattached
to a window.
Change-Id: I2b44f35d0c95404b13912782df8877953609a5d0
Jim Miller [Thu, 21 Oct 2010 01:32:52 +0000 (18:32 -0700)]
Fix
3117937: Add simplified "recent apps".
This adds a simplified recents view for devices that
don't handle 3D well.
Change-Id: I8307cd340caf1d65c8fce80eaf55a1d21bc64312
Gil Dobjanschi [Tue, 26 Oct 2010 02:17:35 +0000 (19:17 -0700)]
Check before and after media item reference
Change-Id: I9abc017896ed82f069479a468e1b0b9d3303e3a6
Gil Dobjanschi [Tue, 26 Oct 2010 02:13:32 +0000 (19:13 -0700)]
Merge "Transition bug fix"
Jeff Brown [Tue, 26 Oct 2010 01:51:57 +0000 (18:51 -0700)]
Merge "Tweak log messages a bit."
Joe Onorato [Tue, 26 Oct 2010 01:48:08 +0000 (18:48 -0700)]
Merge "Don't turn the button backlights on if the screen is off. Part 2." into gingerbread
Romain Guy [Tue, 26 Oct 2010 01:46:04 +0000 (18:46 -0700)]
Merge "Small cleanup."
Jaikumar Ganesh [Thu, 21 Oct 2010 21:55:05 +0000 (14:55 -0700)]
Implement ACTION_CONNECTION_STATE_CHANGED intent.
Change-Id: I6b5783c189c9796ebd85d9d54bdcb07949bef27e
Romain Guy [Tue, 26 Oct 2010 01:42:25 +0000 (18:42 -0700)]
Small cleanup.
Removes unnecessary forward class declaration, make Caches::currentBuffer
private instead of public.
Change-Id: Idba6325c8c602d89239e667cb8ec87e7943f8e75
Romain Guy [Tue, 26 Oct 2010 01:36:13 +0000 (18:36 -0700)]
Merge "Don't change texture unit when not needed."
Romain Guy [Tue, 26 Oct 2010 01:33:16 +0000 (18:33 -0700)]
Don't change texture unit when not needed.
Change-Id: Ifa84426d234f2122402cb13533cb5964f1ce95ec
James Dong [Sat, 23 Oct 2010 00:28:15 +0000 (17:28 -0700)]
Add two creation flags to OMXCodec::Create()
o This allows to force to use software codecs or hardware codecs
o If request cannot be fullfilled, Create() returns NULL.
Change-Id: I02b56a9229abb56d49703fe80ac18571d33f3748
Romain Guy [Tue, 26 Oct 2010 01:06:45 +0000 (18:06 -0700)]
Merge "Don't change textures wrap modes on every draw."
Romain Guy [Tue, 26 Oct 2010 01:03:28 +0000 (18:03 -0700)]
Don't change textures wrap modes on every draw.
Change-Id: If6d3f313778cc7f3e803a063338539c8b3e165e3
James Dong [Tue, 26 Oct 2010 01:02:44 +0000 (18:02 -0700)]
Merge "Remove OMX.PV.* components from OMXCodec.cpp"
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:59:49 +0000 (17:59 -0700)]
am
55744530: Merge "resolved conflicts for merge of
b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp
Merge commit '
55744530222288c79a5e1aa61b65f7f6b2262fab'
* commit '
55744530222288c79a5e1aa61b65f7f6b2262fab':
frameworks/base: Handle null from topRunningNonDelayedActivityLocked
James Dong [Sat, 23 Oct 2010 00:10:43 +0000 (17:10 -0700)]
Remove OMX.PV.* components from OMXCodec.cpp
Change-Id: Ie43c00a4d589e9cca6e9505a5dabd4e0d8af321a
Scott Main [Tue, 26 Oct 2010 00:56:40 +0000 (17:56 -0700)]
Merge "resolved conflicts for merge of
f0b3fa60 to master"
James Dong [Tue, 26 Oct 2010 00:56:14 +0000 (17:56 -0700)]
Merge "Don't change the video recording frame rate if it is not requested."
Scott Main [Tue, 26 Oct 2010 00:54:33 +0000 (17:54 -0700)]
resolved conflicts for merge of
f0b3fa60 to master
Change-Id: Id15a8976a60548d50671d1c7af641302fce2f3d5
Adam Powell [Tue, 26 Oct 2010 00:44:35 +0000 (17:44 -0700)]
Merge "Holo: vertical dividers, group button states, default window backgrounds."
Jeff Brown [Tue, 26 Oct 2010 00:37:46 +0000 (17:37 -0700)]
Tweak log messages a bit.
Change-Id: Ifadf78c1ab8db49106216c70086f98860795c65f
Adam Powell [Mon, 25 Oct 2010 02:25:41 +0000 (19:25 -0700)]
Holo: vertical dividers, group button states, default window backgrounds.
Change-Id: I06b1397a8026d01a2e4eca7e87ca2d1edbe4f92e
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:28:29 +0000 (17:28 -0700)]
Merge "resolved conflicts for merge of
b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:27:16 +0000 (17:27 -0700)]
resolved conflicts for merge of
b4ae2f1b to gingerbread-plus-aosp
Change-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8
Justin Ho [Tue, 26 Oct 2010 00:25:02 +0000 (17:25 -0700)]
am
41d21efd: (-s ours) am
044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
Merge commit '
41d21efd61157c9a4c49b2f7a6580ae0cbb58397'
* commit '
41d21efd61157c9a4c49b2f7a6580ae0cbb58397':
DO NOT MERGE - Updated ringtone assets for crespo
Scott Main [Tue, 26 Oct 2010 00:23:10 +0000 (17:23 -0700)]
am
3d40cd50: am
c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items
Merge commit '
3d40cd5055a8b507877e10bfb81b3ae35a2602a4' into gingerbread-plus-aosp
* commit '
3d40cd5055a8b507877e10bfb81b3ae35a2602a4':
update featured videos
Scott Main [Tue, 26 Oct 2010 00:15:50 +0000 (17:15 -0700)]
am
c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items
Merge commit '
c9ac1079696b93a294f504c6561397ef731a46f9' into gingerbread
* commit '
c9ac1079696b93a294f504c6561397ef731a46f9':
update featured videos
Jaikumar Ganesh [Tue, 26 Oct 2010 00:09:16 +0000 (17:09 -0700)]
Merge "Fix docs builds."
Jaikumar Ganesh [Tue, 26 Oct 2010 00:07:51 +0000 (17:07 -0700)]
Fix docs builds.
Change-Id: I764bd0f0f6994cc468b7ebbea4a3dc7a44b9f89d
Gloria Wang [Mon, 25 Oct 2010 23:56:49 +0000 (16:56 -0700)]
resolved conflicts for merge of
965f960e to master
Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
Justin Ho [Mon, 25 Oct 2010 23:50:34 +0000 (16:50 -0700)]
am
044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
Merge commit '
044df235c86ac69bb0e56cb4387e111ec276276e' into gingerbread-plus-aosp
* commit '
044df235c86ac69bb0e56cb4387e111ec276276e':
DO NOT MERGE - Updated ringtone assets for crespo
Justin Ho [Mon, 25 Oct 2010 23:44:01 +0000 (16:44 -0700)]
Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
Jaikumar Ganesh [Mon, 25 Oct 2010 23:43:41 +0000 (16:43 -0700)]
Merge "Expose Vendor Specific Headset Event Intent."
Gloria Wang [Mon, 25 Oct 2010 23:39:11 +0000 (16:39 -0700)]
Merge "resolved conflicts for merge of
9084631d to gingerbread-plus-aosp" into gingerbread-plus-aosp
Jaikumar Ganesh [Mon, 25 Oct 2010 23:38:48 +0000 (16:38 -0700)]
Merge "Make setting the adapter properties asynchronous."
Justin Ho [Mon, 25 Oct 2010 23:38:41 +0000 (16:38 -0700)]
DO NOT MERGE - Updated ringtone assets for crespo
Change-Id: Ie5c6b0bfa282f976129f5e87a09512da01e6851b
Jaikumar Ganesh [Mon, 25 Oct 2010 23:25:52 +0000 (16:25 -0700)]
Make setting the adapter properties asynchronous.
1. These involve disk operations and multiple processes.
2. onPropertyChange already informs us asychronously.
3. Settings app is the only user, will have to revisit the function
if we make them public.
Change-Id: If019a83c05a0c9e625f27faf99063d33f369f0d8
Joe Malin [Mon, 25 Oct 2010 23:27:15 +0000 (16:27 -0700)]
am
96bdc500: am
5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread
Merge commit '
96bdc500104c3e162495a9bfcf90799467e45c3d'
* commit '
96bdc500104c3e162495a9bfcf90799467e45c3d':
Doc Change: Revert NotePad sample test package
Eric Fischer [Mon, 25 Oct 2010 23:26:58 +0000 (16:26 -0700)]
am
b2ddeee2: (-s ours) am
3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
b2ddeee2d2a4151210a1a3b3cc8af90477fbee2b'
* commit '
b2ddeee2d2a4151210a1a3b3cc8af90477fbee2b':
Import revised translations. DO NOT MERGE
Joe Malin [Mon, 25 Oct 2010 23:22:46 +0000 (16:22 -0700)]
am
5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread
Merge commit '
5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp
* commit '
5016df1cface59b04ad59d0fef29ea32dcad8d60':
Doc Change: Revert NotePad sample test package
Eric Fischer [Mon, 25 Oct 2010 23:19:42 +0000 (16:19 -0700)]
am
3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b' into gingerbread-plus-aosp
* commit '
3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b':
Import revised translations. DO NOT MERGE
Joe Malin [Mon, 25 Oct 2010 23:19:18 +0000 (16:19 -0700)]
Merge "Doc Change: Revert NotePad sample test package" into gingerbread
James Dong [Sun, 24 Oct 2010 16:32:39 +0000 (09:32 -0700)]
Don't change the video recording frame rate if it is not requested.
o set the default video frame rate to the current frame rate being used
o add check on whether the requested frame rate is supported
o fix an issue where the hardware video encoder setting was bypassed
o increases the max frame rate from 30 t0 120 frames per second
the actual frame rate will be clipped if the requested frame rate is too
high when recording starts by checking the hardware encoder capabilities
Change-Id: I1b47671d74da0ebcb9601bdca390d430cc048fbc
OSDN Git Service
