Commit Graph

19098 Commits

Author SHA1 Message Date
Romain Guy
761eaed2ff Fix tons of bugs and add new text rendering support.
Change-Id: I326c66b10784006f6df2f12d38e120cef94cd0d7
2010-08-10 12:22:01 -07:00
Chet Haase
acec485bf3 Merge "Add 3D rotation to View" 2010-08-10 11:01:42 -07:00
James Dong
dfb23d7213 am a0488341: am 532d2ac5: Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread
Merge commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990'

* commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990':
  Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
2010-08-10 10:48:59 -07:00
James Dong
b084d125e6 am 532d2ac5: Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread
Merge commit '532d2ac5d5c06c3938c4999238d1051207bfe53c' into gingerbread-plus-aosp

* commit '532d2ac5d5c06c3938c4999238d1051207bfe53c':
  Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
2010-08-10 10:44:25 -07:00
James Dong
c4d25e70d6 Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread 2010-08-10 10:41:29 -07:00
Brett Chabot
f2398fd064 am 4f941812: am e967ee49: Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread
Merge commit '4f94181282e7f23d19a5fcab5f1b93d6d52e7715'

* commit '4f94181282e7f23d19a5fcab5f1b93d6d52e7715':
  Fix gingerbread FrameworkCoreTests makefile.
2010-08-10 10:34:00 -07:00
Brett Chabot
a45a550667 am e967ee49: Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread
Merge commit 'e967ee49b5a86de2be11dd1d28283c337b01e537' into gingerbread-plus-aosp

* commit 'e967ee49b5a86de2be11dd1d28283c337b01e537':
  Fix gingerbread FrameworkCoreTests makefile.
2010-08-10 10:30:32 -07:00
Brett Chabot
c3e4612796 Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread 2010-08-10 10:27:48 -07:00
Maksymilian Osowski
e22e348d5e Merge "Changed some parts of the code to prepare it for script support that will come in later commit." 2010-08-10 07:42:47 -07:00
Mike Lockwood
4f5bb6cbd6 Merge changes I4f117090,Ifd449c4e
* changes:
  MTP: Push queries for supported formats and properties up to Java.
  MTP: turn off verbose logging
2010-08-10 06:13:35 -07:00
Maksymilian Osowski
d6ea51f345 Merge "Added generating text summary to Summarizer." 2010-08-10 05:41:40 -07:00
Hung-ying Tyan
c6da60c690 am f13542f2: am 259b4c86: Merge "SIP: clean up unused class and fields." into gingerbread
Merge commit 'f13542f2eba27d9b09ba6aa313f758e5518caa00'

* commit 'f13542f2eba27d9b09ba6aa313f758e5518caa00':
  SIP: clean up unused class and fields.
2010-08-09 22:44:37 -07:00
Hung-ying Tyan
d39ba74c2d am 259b4c86: Merge "SIP: clean up unused class and fields." into gingerbread
Merge commit '259b4c860212dd528b25d1cce6e74be01afed85c' into gingerbread-plus-aosp

* commit '259b4c860212dd528b25d1cce6e74be01afed85c':
  SIP: clean up unused class and fields.
2010-08-09 22:37:46 -07:00
Hung-ying Tyan
576b36e360 Merge "SIP: clean up unused class and fields." into gingerbread 2010-08-09 22:30:58 -07:00
Jaikumar Ganesh
b0e1550b2a am 4a671a74: am 745d1e90: Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread
Merge commit '4a671a745202cb15cc668d46400731a03b068558'

* commit '4a671a745202cb15cc668d46400731a03b068558':
  Update javadoc for the API and change return of getBondedDevices().
2010-08-09 20:00:53 -07:00
Konstantin Lopyrev
72521a2f29 am 8cdf4d92: am 6c6d57c6: Merge "Fix focus notification" into gingerbread
Merge commit '8cdf4d92ec93b7ba1ea6d7aaf3540283edfc6925'

* commit '8cdf4d92ec93b7ba1ea6d7aaf3540283edfc6925':
  Fix focus notification
2010-08-09 20:00:48 -07:00
Konstantin Lopyrev
caba21acd1 am 75493be9: am 63cca691: Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread
Merge commit '75493be9c0b4dd24fc5cddce6ee993ce5f0b2887'

* commit '75493be9c0b4dd24fc5cddce6ee993ce5f0b2887':
  Make sure profiling is done only for views that are actually measured, laid out and drawn.
2010-08-09 20:00:44 -07:00
Jean-Michel Trivi
c512417c71 am 2f5f154d: am 66edf558: Merge "Fix bug 2684341 Don\'t steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread
Merge commit '2f5f154d6a090b4ea2ee3645857f2fcae88daa54'

* commit '2f5f154d6a090b4ea2ee3645857f2fcae88daa54':
  Fix bug 2684341 Don't steal the media button event from the phone
2010-08-09 20:00:40 -07:00
Jaikumar Ganesh
71d9590c37 am 4e25db6a: am cbaef518: Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread
Merge commit '4e25db6a51c4182139b85e3b01317d161f944bbb'

* commit '4e25db6a51c4182139b85e3b01317d161f944bbb':
  Check whether Bluetooth is enabled before making any API calls.
2010-08-09 20:00:36 -07:00
James Dong
f72b11c612 am fa4f57fe: am 959909ef: Merge "Support multiple PPS and SPS in avcC box" into gingerbread
Merge commit 'fa4f57fe0f85d2340524311f1409e0a1b2864a6e'

* commit 'fa4f57fe0f85d2340524311f1409e0a1b2864a6e':
  Support multiple PPS and SPS in avcC box
2010-08-09 20:00:32 -07:00
Andreas Huber
9fdb3271bc am e14923b0: am 4edf85ab: Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread
Merge commit 'e14923b0c80b2e73e69b7917c1f170b356592d29'

* commit 'e14923b0c80b2e73e69b7917c1f170b356592d29':
  Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
2010-08-09 20:00:25 -07:00
Eric Laurent
1829b8cf23 am 18afcee7: am 67400d49: Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread
Merge commit '18afcee767694fd1dce1a371769dc898102143ff'

* commit '18afcee767694fd1dce1a371769dc898102143ff':
  Added tests for audio effects in MediaFrameworkTest
2010-08-09 20:00:20 -07:00
Eric Laurent
f07745ada6 am 1ece7d68: am 2a6b80bc: Fixed several audio effects problems.
Merge commit '1ece7d6873027068a3e7b055597045e9387b217c'

* commit '1ece7d6873027068a3e7b055597045e9387b217c':
  Fixed several audio effects problems.
2010-08-09 20:00:11 -07:00
Hung-ying Tyan
a78e37c1ef am 8b8b4536: am 8fb2e6e4: PhoneFactory: add makeSipPhone()
Merge commit '8b8b4536314d1354c244af2c9e665c4db4e27522'

* commit '8b8b4536314d1354c244af2c9e665c4db4e27522':
  PhoneFactory: add makeSipPhone()
2010-08-09 20:00:05 -07:00
Hung-ying Tyan
b52dffd9ad am 51128faa: am d122805b: CallManager: add getAllPhones().
Merge commit '51128faa8cf1f3d25ee7db745b9e18e69e04cd31'

* commit '51128faa8cf1f3d25ee7db745b9e18e69e04cd31':
  CallManager: add getAllPhones().
2010-08-09 19:59:43 -07:00
Jaikumar Ganesh
d37a8fa969 am 745d1e90: Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread
Merge commit '745d1e905886ed0d8fa0a8590463093d125bc53a' into gingerbread-plus-aosp

* commit '745d1e905886ed0d8fa0a8590463093d125bc53a':
  Update javadoc for the API and change return of getBondedDevices().
2010-08-09 19:53:57 -07:00
Konstantin Lopyrev
7e3eed4db3 am 6c6d57c6: Merge "Fix focus notification" into gingerbread
Merge commit '6c6d57c6a04eed154de1f7d9b544c2cb34a83dac' into gingerbread-plus-aosp

* commit '6c6d57c6a04eed154de1f7d9b544c2cb34a83dac':
  Fix focus notification
2010-08-09 19:53:48 -07:00
Konstantin Lopyrev
42c81a7610 am 63cca691: Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread
Merge commit '63cca69157eae17da2a5492d1bcb7330061a52ac' into gingerbread-plus-aosp

* commit '63cca69157eae17da2a5492d1bcb7330061a52ac':
  Make sure profiling is done only for views that are actually measured, laid out and drawn.
2010-08-09 19:53:44 -07:00
Jean-Michel Trivi
2f4289991a am 66edf558: Merge "Fix bug 2684341 Don\'t steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread
Merge commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b' into gingerbread-plus-aosp

* commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b':
  Fix bug 2684341 Don't steal the media button event from the phone
2010-08-09 19:53:20 -07:00
Jaikumar Ganesh
3b362bebfc am cbaef518: Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread
Merge commit 'cbaef51847ab8d8c4d039f0e425d434811f77f0d' into gingerbread-plus-aosp

* commit 'cbaef51847ab8d8c4d039f0e425d434811f77f0d':
  Check whether Bluetooth is enabled before making any API calls.
2010-08-09 19:53:16 -07:00
James Dong
778f649eac am 959909ef: Merge "Support multiple PPS and SPS in avcC box" into gingerbread
Merge commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f' into gingerbread-plus-aosp

* commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f':
  Support multiple PPS and SPS in avcC box
2010-08-09 19:53:12 -07:00
Andreas Huber
fdf9769ab0 am 4edf85ab: Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread
Merge commit '4edf85abc919b7d0e8db71c0c6166c7994269830' into gingerbread-plus-aosp

* commit '4edf85abc919b7d0e8db71c0c6166c7994269830':
  Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
2010-08-09 19:53:01 -07:00
Eric Laurent
02083117c1 am 67400d49: Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread
Merge commit '67400d492bfd1f1a8a3d03dc93957a1467f4c7d0' into gingerbread-plus-aosp

* commit '67400d492bfd1f1a8a3d03dc93957a1467f4c7d0':
  Added tests for audio effects in MediaFrameworkTest
2010-08-09 19:52:53 -07:00
Eric Laurent
ab666c7a07 am 2a6b80bc: Fixed several audio effects problems.
Merge commit '2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee' into gingerbread-plus-aosp

* commit '2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee':
  Fixed several audio effects problems.
2010-08-09 19:52:43 -07:00
Hung-ying Tyan
d7fcc4c770 am 8fb2e6e4: PhoneFactory: add makeSipPhone()
Merge commit '8fb2e6e4720385961083a150a3e848ccaef544ae' into gingerbread-plus-aosp

* commit '8fb2e6e4720385961083a150a3e848ccaef544ae':
  PhoneFactory: add makeSipPhone()
2010-08-09 19:52:28 -07:00
Hung-ying Tyan
3881a29a14 am d122805b: CallManager: add getAllPhones().
Merge commit 'd122805bbfcb770f941cac259bcefafdb2d3ad56' into gingerbread-plus-aosp

* commit 'd122805bbfcb770f941cac259bcefafdb2d3ad56':
  CallManager: add getAllPhones().
2010-08-09 19:52:19 -07:00
Manuel Roman
7cc3d1890e Merge "Incorporated Joe's comments" 2010-08-09 18:57:45 -07:00
Jaikumar Ganesh
b5a3d0a150 Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread 2010-08-09 17:30:25 -07:00
Konstantin Lopyrev
a06eec8660 Merge "Fix focus notification" into gingerbread 2010-08-09 17:03:10 -07:00
Konstantin Lopyrev
cbceb6f2f2 Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread 2010-08-09 17:02:39 -07:00
Dianne Hackborn
bf71a84273 Merge "This may fix LoaderManager bug where a closed cursor could be used." 2010-08-09 16:57:18 -07:00
Jean-Michel Trivi
c2fab76f69 Merge "Fix bug 2684341 Don't steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread 2010-08-09 14:19:08 -07:00
Jaikumar Ganesh
4d021abf6c Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread 2010-08-09 13:50:28 -07:00
James Dong
f13b68e556 Merge "Support multiple PPS and SPS in avcC box" into gingerbread 2010-08-09 13:35:54 -07:00
Mike Lockwood
59b0371315 Merge "MTP: Fix reading and writing property descriptors" 2010-08-09 11:55:40 -07:00
Mike Lockwood
987b0dca6c Merge changes Ia95ff014,Ib31708c3
* changes:
  MTP: Add debug code for printing names of MTP format and property codes.
  MTP: Fix some typos
2010-08-09 11:38:29 -07:00
Andreas Huber
daae89bc67 Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread 2010-08-09 11:30:34 -07:00
Eric Laurent
df60362e87 Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread 2010-08-09 10:42:27 -07:00
Maksymilian Osowski
a3b837c081 Merge "Added crash-detection mechanism." 2010-08-09 06:36:39 -07:00
Romain Guy
0ff0b453b5 Merge "Enforce maximum texture size." 2010-08-07 23:49:15 -07:00