26364 Commits

Author SHA1 Message Date
Dianne Hackborn
8ae5a8e7c0 Get to the point of being able to do native drawing.
A little cleanup.

Change-Id: I37ef0557abf330d91d6fe47e81d062206b3bc346
2010-07-01 18:44:46 -07:00
Romain Guy
5468cab7fb Merge "Track the size in memory of the texture cache." 2010-07-01 18:29:42 -07:00
Romain Guy
121e224256 Track the size in memory of the texture cache.
The texture cache was previously checking the number of stored textures. This was
not very useful as this could easily lead to an abuse of memory. The new cache
instead tracks the total size occupied in RAM by the cached textures. When a new
texture is generated, older textures are kicked out as needed.

Change-Id: Ib27142f4a018d5bf84774c1fb6f45a67a85f20bc
2010-07-01 18:26:52 -07:00
Shimeng (Simon) Wang
72b4f9336a Merge "Fix zoom overview logic." 2010-07-01 17:58:03 -07:00
Steve Howard
ce94584096 Log full exception when failing to inflate notification view
When inflating a notification's view fails, include the exception in
the log message.  Without this exception all we get is "couldn't
inflate view for notification <package>/<id>", which isn't very
helpful for tracking down the particular error in the view.

This exception used to be included in the log message, but it was
removed in 005847b03b2 -- any particular reason why?

Change-Id: I623b9e4c8291e4c035f26380e5f22ad6b65176a7
2010-07-01 17:54:16 -07:00
Shimeng (Simon) Wang
d5c6a16b51 Fix zoom overview logic.
issue: 2778976
Change-Id: Id859c473190d067e378cf149d9a7bf9e914ee6e7
2010-07-01 17:53:49 -07:00
Elliott Hughes
1ad636c315 Defer to ICU's knowledge of language-specific grammatical quantity rules.
Also improve the documentation to make it a little less unclear what this
is all about. In particular, explain why the original submitter's complaint
about "zero" never being used in English, is expected behavior.

Bug: 2663392
Change-Id: Iade3b4f5c549ce01a95fd0e7e5c6ea394178eda3
2010-07-01 16:51:48 -07:00
Alex Sakhartchouk
704aba52a8 Merge "Start of mesh API cleanup. Switched all native code to go through Mesh class. Removed SimpleMesh Added java Mesh class Will need to port all existing code to use java Mesh, then remove java SimpleMesh." 2010-07-01 16:47:40 -07:00
Jason Sams
f60cf81889 Improve multitouch support so pointers other than 0 can change colors.
Change-Id: I4f9f71f70306cc4a3b11906ae47a5fa2e305fc3f
2010-07-01 16:41:24 -07:00
Eric Laurent
e7f49e0d32 am 64fa7f07: am f520411a: am c03befe3: Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Merge commit '64fa7f072a2eff834206ce245f137993b010f5c0'

* commit '64fa7f072a2eff834206ce245f137993b010f5c0':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
2010-07-01 16:41:12 -07:00
Eric Laurent
64fa7f072a am f520411a: am c03befe3: Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Merge commit 'f520411a35db5248934a4b50859ca72e3f865593' into gingerbread-plus-aosp

* commit 'f520411a35db5248934a4b50859ca72e3f865593':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
2010-07-01 16:38:33 -07:00
Andreas Huber
03431d2fa6 Added AMessage::debugString() for debugging purposes.
Change-Id: Id43ffd2c56d659dc29f37e277f8c7b38f11c1591
2010-07-01 16:36:55 -07:00
Eric Laurent
f520411a35 am c03befe3: Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Merge commit 'c03befe3d62eb2a3e1d56fec0ca188a6094d53dd' into gingerbread

* commit 'c03befe3d62eb2a3e1d56fec0ca188a6094d53dd':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
2010-07-01 16:36:02 -07:00
Eric Laurent
c03befe3d6 Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Problem:
When the bluetooth device is removed, the AudioService clears all active SCO connections
and unlinks from the client application's binder interface death.
The problem is that the unlinking is done even if no more connections are active for a given client,
which throws a runtime exception that is not catched causing the system server to crash.

The fix consists in calling unlinkToDeath() in ScoClient.clearCount() only if the number of
active SCO connections for this client is not 0. The NoSuchElementException exception is also
catched when calling unlinkToDeath()

Change-Id: I7086424301fc63a5666da61c38169349d3e078f4
2010-07-01 16:23:34 -07:00
Alex Sakhartchouk
164aaedf7f Start of mesh API cleanup.
Switched all native code to go through Mesh class.
Removed SimpleMesh
Added java Mesh class
Will need to port all existing code to use java Mesh, then remove java SimpleMesh.

Change-Id: Idb9c03d0b06b4ef87db28dffcffa1881d39120e5
2010-07-01 16:14:12 -07:00
Dianne Hackborn
738639ccd0 am 58f35ff4: am 54a181b1: Make real API for native code to get its window.
Merge commit '58f35ff41601769ca4f357575a9385f16c01b991'

* commit '58f35ff41601769ca4f357575a9385f16c01b991':
  Make real API for native code to get its window.
2010-07-01 16:04:02 -07:00
Dianne Hackborn
58f35ff416 am 54a181b1: Make real API for native code to get its window.
Merge commit '54a181b1a2b1517a9479b21fbf7705a688232faf' into gingerbread-plus-aosp

* commit '54a181b1a2b1517a9479b21fbf7705a688232faf':
  Make real API for native code to get its window.
2010-07-01 16:00:19 -07:00
Jason Sams
3cd310f18d Merge "Update fountain with multitouch support." 2010-07-01 15:42:47 -07:00
Romain Guy
37f447338e Merge "Don't use full screen FBOs, this dramatically increase performance." 2010-07-01 15:29:49 -07:00
Romain Guy
f86ef57f8b Don't use full screen FBOs, this dramatically increase performance.
The next step will be to add an FBO cache to avoid churning memory on every
frame we draw. This change also adds support for drawBitmap(Bitmap, Matrix, Paint).

Change-Id: I7825cdcf0cad9bffe6219e05d8328a53d4a6e583
2010-07-01 15:27:21 -07:00
Scott Main
db3b598c93 docs: update device dashboard; add historical chart
Change-Id: Iafed4ed927141d34dcdb728918320be2fa2cf151
2010-07-01 14:57:41 -07:00
Nipun Kwatra
d26920ada0 Adding timelapse capture from videocamera.
Current implementation looks at the timestamps of all incoming frames in
CameraSource::dataCallbackTimestamp().
It drops all frames until enough time has elapsed to get the next time lapse frame.
When enough time has passed to capture the next time lapse frame, the frame is no longer dropped
and the timestamp of this frame is modified to be one frame time (1/framerate) ahead of the
last encoded frame's time stamp.

Change-Id: I82b9d5e96113dffa6901aac3b8a8ef999ffc1d0b
2010-07-01 14:54:36 -07:00
Dianne Hackborn
54a181b1a2 Make real API for native code to get its window.
Added implementation to use ANativeWindow and provide
it to a NativeActivity.

Change-Id: I890d71b6e15d4af71e6cf81b327961d7061ec1c2
2010-07-01 14:43:23 -07:00
James Dong
3bf8430e05 am d6ec2175: am 65c83b90: Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread
Merge commit 'd6ec21751b26a35fc8c912940a2c4720bdbf1083'

* commit 'd6ec21751b26a35fc8c912940a2c4720bdbf1083':
  Refactor Stagefright::StartMPEG4Recording()
2010-07-01 14:15:00 -07:00
James Dong
d6ec21751b am 65c83b90: Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread
Merge commit '65c83b906d01c3c1493d0547757dbb16d4c3722a' into gingerbread-plus-aosp

* commit '65c83b906d01c3c1493d0547757dbb16d4c3722a':
  Refactor Stagefright::StartMPEG4Recording()
2010-07-01 14:12:47 -07:00
James Dong
65c83b906d Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread 2010-07-01 14:11:01 -07:00
Amith Yamasani
69fc43d495 am 2cc2c75d: (-s ours) am c7dacb73: Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread
Merge commit '2cc2c75dccc08ecbffb44a47463df9a139e2786e'

* commit '2cc2c75dccc08ecbffb44a47463df9a139e2786e':
  DO NOT MERGE: Add a battery capacity value to the power profile.
2010-07-01 13:55:26 -07:00
Amith Yamasani
2cc2c75dcc am c7dacb73: Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread
Merge commit 'c7dacb7374e04c003b0764e7c348765b629c18cb' into gingerbread-plus-aosp

* commit 'c7dacb7374e04c003b0764e7c348765b629c18cb':
  DO NOT MERGE: Add a battery capacity value to the power profile.
2010-07-01 13:53:08 -07:00
Amith Yamasani
c7dacb7374 Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread 2010-07-01 13:51:27 -07:00
Jean-Baptiste Queru
61af57bfc3 Merge "Fix missing NL" 2010-07-01 13:46:03 -07:00
Adam Powell
85e39f64e8 Merge "Add AbsListView#smoothScrollToPositionFromTop" 2010-07-01 13:45:58 -07:00
Amith Yamasani
169741b708 DO NOT MERGE: Add a battery capacity value to the power profile.
Can be accessed through PowerProfile.getBatteryCapacity()

Individual device profiles need to be updated with their capacities.

(merged from master)

Change-Id: Ie76ab6de47c44807a46934331665e077a7226566
2010-07-01 13:42:59 -07:00
Jason Parks
2ed26c4e5c Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." 2010-07-01 13:37:13 -07:00
satok
adfb59907a Merge "Remove EditStyledText from the framekwork" 2010-07-01 13:24:26 -07:00
Adam Powell
e44afae7ff Add AbsListView#smoothScrollToPositionFromTop
Change-Id: I4dec9cdcf63b1075264c772faf1303c7281d0efe
2010-07-01 13:04:34 -07:00
Jason Sams
60b0c1dada Update fountain with multitouch support.
Change-Id: I510f3f2d604f4ecacd7e18d8c6eddd827f458c70
2010-07-01 13:02:26 -07:00
Jason Parks
4b08d3e437 Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.
Not closing the cursors was a bit of a bug since the documenation explicitly says that it would close the cursors. This will get rid of all the warnings that are printed out in the finalizer about the cursor not being closed.

Change-Id: I8dcedbdf7378cea7407502445269b5b0bded1a3d
2010-07-01 14:38:02 -05:00
Eric Laurent
e822c99511 am eba857d1: am a0c2b539: Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread
Merge commit 'eba857d126e2b76a368f41d3169a56fe28029674'

* commit 'eba857d126e2b76a368f41d3169a56fe28029674':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
2010-07-01 11:59:10 -07:00
Andreas Huber
2d3dcac183 am d51c2cac: am 45bac57a: Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
Merge commit 'd51c2cacce4ad945bea4c00cea4326cf76b49cd2'

* commit 'd51c2cacce4ad945bea4c00cea4326cf76b49cd2':
  Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
2010-07-01 11:56:16 -07:00
Eric Laurent
eba857d126 am a0c2b539: Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread
Merge commit 'a0c2b53966238125143dec01d3f2598a8b9e33a2' into gingerbread-plus-aosp

* commit 'a0c2b53966238125143dec01d3f2598a8b9e33a2':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
2010-07-01 11:56:11 -07:00
Joe Onorato
06abd91d7a am 393e1459: am a2dd4c17: put the status bar back in the system process
Merge commit '393e1459340effdb8bdc6531e22c0976d0aea026'

* commit '393e1459340effdb8bdc6531e22c0976d0aea026':
  put the status bar back in the system process
2010-07-01 11:55:46 -07:00
Joe Onorato
b3066ee5f7 am 6fd470fb: am 6be4739e: quiet noisy debug spew
Merge commit '6fd470fbdc46777d7dc201bd6f475becc7976014'

* commit '6fd470fbdc46777d7dc201bd6f475becc7976014':
  quiet noisy debug spew
2010-07-01 11:55:42 -07:00
Chih-Chung Chang
4024ddcf66 am bda93c4c: am 09b90057: Add multiple camera support for in MediaProfiles.
Merge commit 'bda93c4cb94b47c86251d22df16e46a514c191ef'

* commit 'bda93c4cb94b47c86251d22df16e46a514c191ef':
  Add multiple camera support for in MediaProfiles.
2010-07-01 11:55:27 -07:00
Eric Laurent
a0c2b53966 Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread 2010-07-01 11:54:00 -07:00
Christopher Tate
8dfabd9c6f resolved conflicts for merge of d3233ae9 to master
Change-Id: I59ecf8f2d3bd253f51457c11ec15f022ac5fdeb6
2010-07-01 11:49:41 -07:00
Grace Kloba
9a9fd64ab7 Remove the TODO as it has been fixed with changes
for http://b/issue?id=2666473.
2010-07-01 11:07:22 -07:00
James Dong
7b06de6d5a Refactor Stagefright::StartMPEG4Recording()
- Also, better error handling

Change-Id: Ic18d08dc6489adf92c6a588efa4baca66429b175
2010-07-01 10:28:38 -07:00
Andreas Huber
d51c2cacce am 45bac57a: Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
Merge commit '45bac57aa00281e6b45756c691c588bdaf762521' into gingerbread-plus-aosp

* commit '45bac57aa00281e6b45756c691c588bdaf762521':
  Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
2010-07-01 10:07:17 -07:00
Andreas Huber
45bac57aa0 Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
Change-Id: I972324a8fc9757e6e8116b0270ec0882106f8733
2010-07-01 09:08:38 -07:00
Mike Lockwood
1a3e1056db Merge "MTP: Remove an unnecessary thread from the MtpClient class." 2010-07-01 08:40:24 -07:00