Commit Graph

18985 Commits

Author SHA1 Message Date
Scott Main
92fe1af1c4 am bed5af7e: am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Merge commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6' into gingerbread-plus-aosp

* commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6':
  add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
2010-10-08 17:36:00 -07:00
Scott Main
e60bb383aa am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Merge commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15' into gingerbread

* commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15':
  add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
2010-10-08 17:27:28 -07:00
Gilles Debunne
52cdd29ecb am a827d7bc: Merge "Other improvements to text cursor movement." into gingerbread
Merge commit 'a827d7bc347ce6f1a0074dd9fe515919a35a38a9' into gingerbread-plus-aosp

* commit 'a827d7bc347ce6f1a0074dd9fe515919a35a38a9':
  Other improvements to text cursor movement.
2010-10-08 17:21:42 -07:00
Mindy Pereira
cc7fa43736 am 13a81aad: Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread
Merge commit '13a81aad3dcc2f0410ffe624e3666a15ee9c82dd' into gingerbread-plus-aosp

* commit '13a81aad3dcc2f0410ffe624e3666a15ee9c82dd':
  DO NOT MERGE Limit the height of the pull glow.
2010-10-08 17:14:56 -07:00
Gilles Debunne
c91355b2b7 Merge "Other improvements to text cursor movement." into gingerbread 2010-10-08 17:14:45 -07:00
Mindy Pereira
e0af18ecb6 Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread 2010-10-08 17:10:21 -07:00
Scott Main
97df820ba8 am 3d265b57: am 50f86c65: docs: a few style adjustments to admin doc
Merge commit '3d265b5775a74b1d5eb726238f13cf63e8465594' into gingerbread-plus-aosp

* commit '3d265b5775a74b1d5eb726238f13cf63e8465594':
  docs: a few style adjustments to admin doc
2010-10-08 16:43:06 -07:00
Scott Main
1965b2da51 am 50f86c65: docs: a few style adjustments to admin doc
Merge commit '50f86c65206072be0ca924f03b8d460365199bcd' into gingerbread

* commit '50f86c65206072be0ca924f03b8d460365199bcd':
  docs: a few style adjustments to admin doc
2010-10-08 16:39:08 -07:00
Scott Main
2bd20112a5 am 72552887: am 2e5a22aa: docs: remove old "new" tags from side nav
Merge commit '7255288755661587958d384338d4808e76959d86' into gingerbread-plus-aosp

* commit '7255288755661587958d384338d4808e76959d86':
  docs: remove old "new" tags from side nav
2010-10-08 16:37:51 -07:00
Scott Main
a0f02af69d am 2e5a22aa: docs: remove old "new" tags from side nav
Merge commit '2e5a22aa3cd9ca81c82e93044dca6f36c395746d' into gingerbread

* commit '2e5a22aa3cd9ca81c82e93044dca6f36c395746d':
  docs: remove old "new" tags from side nav
2010-10-08 16:30:47 -07:00
Andreas Huber
ed8a950343 am beffefa2: Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread
Merge commit 'beffefa24f398b610d58dd583d9f5613dc529c28' into gingerbread-plus-aosp

* commit 'beffefa24f398b610d58dd583d9f5613dc529c28':
  RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
2010-10-08 15:55:44 -07:00
Scott Main
2808b8a800 am d7170b2a: am 65e62f4f: docs: new web apps dev guides
Merge commit 'd7170b2a68dc9b9df6de9b063d25ff0ec20c86c4' into gingerbread-plus-aosp

* commit 'd7170b2a68dc9b9df6de9b063d25ff0ec20c86c4':
  docs: new web apps dev guides
2010-10-08 15:55:40 -07:00
Brad Fitzpatrick
70c8c54767 am a4682ed7: Merge "Minor SharedPreference clean-up." into gingerbread
Merge commit 'a4682ed7547e895605d102ab17fc5c134b4ab38f' into gingerbread-plus-aosp

* commit 'a4682ed7547e895605d102ab17fc5c134b4ab38f':
  Minor SharedPreference clean-up.
2010-10-08 15:51:32 -07:00
Andreas Huber
313ecd5352 Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread 2010-10-08 15:49:48 -07:00
Scott Main
08302f0a0f am 65e62f4f: docs: new web apps dev guides
Merge commit '65e62f4f908394fc469cf535fef7c16035a428a2' into gingerbread

* commit '65e62f4f908394fc469cf535fef7c16035a428a2':
  docs: new web apps dev guides
2010-10-08 15:43:44 -07:00
Brad Fitzpatrick
8623f94279 Merge "Minor SharedPreference clean-up." into gingerbread 2010-10-08 15:35:45 -07:00
Dianne Hackborn
f54a0e101a am 62d8874e: Merge "Fix retaining of granted permissions when updating of system app." into gingerbread
Merge commit '62d8874eb74045b37140857ea3b31f198f0adffa' into gingerbread-plus-aosp

* commit '62d8874eb74045b37140857ea3b31f198f0adffa':
  Fix retaining of granted permissions when updating of system app.
2010-10-08 15:24:30 -07:00
Dianne Hackborn
9c331df44c Merge "Fix retaining of granted permissions when updating of system app." into gingerbread 2010-10-08 15:21:49 -07:00
Dianne Hackborn
0aeef9c1d8 am db56b9bd: Merge "Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread
Merge commit 'db56b9bd39e739474684987b83f386f50596aa5d' into gingerbread-plus-aosp

* commit 'db56b9bd39e739474684987b83f386f50596aa5d':
  Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock
2010-10-08 15:12:55 -07:00
Dianne Hackborn
292ec505a3 Merge "Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread 2010-10-08 15:09:23 -07:00
Steve Howard
7b082a34b9 am d8d60da6: Merge "Update DownloadManager API to support bulk actions." into gingerbread
Merge commit 'd8d60da616343b3520b666c385d0005db860be83' into gingerbread-plus-aosp

* commit 'd8d60da616343b3520b666c385d0005db860be83':
  Update DownloadManager API to support bulk actions.
2010-10-08 14:44:42 -07:00
Gilles Debunne
ecd641b891 am 50662f5f: Merge "TextView cursor and selection improvements." into gingerbread
Merge commit '50662f5f04d69b9ec0335f17cfbf6c035bd86577' into gingerbread-plus-aosp

* commit '50662f5f04d69b9ec0335f17cfbf6c035bd86577':
  TextView cursor and selection improvements.
2010-10-08 14:44:38 -07:00
Steve Howard
ef74539961 Merge "Update DownloadManager API to support bulk actions." into gingerbread 2010-10-08 14:42:43 -07:00
Gilles Debunne
31a7f2409b Merge "TextView cursor and selection improvements." into gingerbread 2010-10-08 14:42:42 -07:00
Dianne Hackborn
be32100059 am 9934fa77: Merge "Fix issue #3074745: Crash in system process" into gingerbread
Merge commit '9934fa77efab362729d0d3cb8aa0bdcd31d63ead' into gingerbread-plus-aosp

* commit '9934fa77efab362729d0d3cb8aa0bdcd31d63ead':
  Fix issue #3074745: Crash in system process
2010-10-08 14:12:20 -07:00
Dianne Hackborn
51861cda0e Merge "Fix issue #3074745: Crash in system process" into gingerbread 2010-10-08 14:05:01 -07:00
Jean-Baptiste Queru
4a849d555a am 38f53488: Merge "NullPointerException at handleMessage(GSMPhone.java)"
Merge commit '38f534882eb9214b4c1a8035990157f941762f85' into gingerbread-plus-aosp

* commit '38f534882eb9214b4c1a8035990157f941762f85':
  NullPointerException at handleMessage(GSMPhone.java)
2010-10-08 13:32:30 -07:00
Jean-Baptiste Queru
7d2f049b63 Merge "NullPointerException at handleMessage(GSMPhone.java)" 2010-10-08 13:16:18 -07:00
Brad Fitzpatrick
3ebd2bd5de am a2a1ca42: Merge "DropBoxManager.Entry implements Closeable" into gingerbread
Merge commit 'a2a1ca42bc07af77a8a10b714517d006cb66c36a' into gingerbread-plus-aosp

* commit 'a2a1ca42bc07af77a8a10b714517d006cb66c36a':
  DropBoxManager.Entry implements Closeable
2010-10-08 13:01:29 -07:00
Brad Fitzpatrick
6dd8eec818 Merge "DropBoxManager.Entry implements Closeable" into gingerbread 2010-10-08 12:59:30 -07:00
Andreas Huber
10776901d8 am 0fd4e216: Merge "Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR." into gingerbread
Merge commit '0fd4e216e7d6045528d5d1010f8b5f01581efb10' into gingerbread-plus-aosp

* commit '0fd4e216e7d6045528d5d1010f8b5f01581efb10':
  Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
2010-10-08 12:54:32 -07:00
Andreas Huber
1b66c4aca7 Merge "Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR." into gingerbread 2010-10-08 12:51:31 -07:00
Jeff Brown
5911d0da61 am d00b4386: Merge "Clarify some comments on individual key codes." into gingerbread
Merge commit 'd00b4386aed2ef58077490ca7de7d93b98ed51fb' into gingerbread-plus-aosp

* commit 'd00b4386aed2ef58077490ca7de7d93b98ed51fb':
  Clarify some comments on individual key codes.
2010-10-08 12:48:27 -07:00
Jeff Brown
6ce23c4c8e Merge "Clarify some comments on individual key codes." into gingerbread 2010-10-08 12:44:43 -07:00
Mindy Pereira
1d06ec6fc5 am 612d570a: DO NOT MERGE Adjust amount pull effects the glow and edge decay.
Merge commit '612d570a6fc1e5a0e2e56250f597d1e96d698273' into gingerbread-plus-aosp

* commit '612d570a6fc1e5a0e2e56250f597d1e96d698273':
  DO NOT MERGE Adjust amount pull effects the glow and edge decay.
2010-10-08 12:10:09 -07:00
Mike Lockwood
f61b85883d am aecab79b: Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread
Merge commit 'aecab79b4ec4727a59a5532c7db2683c617e8c21' into gingerbread-plus-aosp

* commit 'aecab79b4ec4727a59a5532c7db2683c617e8c21':
  Remove races in Geocoder/LocationProvider Proxy
2010-10-08 11:20:33 -07:00
Andreas Huber
22a7979f09 am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
Merge commit 'f72dd0190ee64914161d361be1213eda8cab7b90' into gingerbread-plus-aosp

* commit 'f72dd0190ee64914161d361be1213eda8cab7b90':
  Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
2010-10-08 11:18:03 -07:00
Mike Lockwood
7bfdae64bd Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread 2010-10-08 11:17:17 -07:00
Andreas Huber
5d372aabe4 Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread 2010-10-08 11:16:07 -07:00
Andreas Huber
90bbd64e71 am b9bf5457: Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread
Merge commit 'b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c' into gingerbread-plus-aosp

* commit 'b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c':
  Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
2010-10-08 11:05:10 -07:00
Andreas Huber
ef072a1f4b Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread 2010-10-08 10:59:52 -07:00
James Dong
5a7c0ea14f am 6dcdfdb4: Merge "Name the writer threads" into gingerbread
Merge commit '6dcdfdb42a562747dceb1e9fb2aa10c67d18959f' into gingerbread-plus-aosp

* commit '6dcdfdb42a562747dceb1e9fb2aa10c67d18959f':
  Name the writer threads
2010-10-08 10:35:57 -07:00
Andreas Huber
f3aa191123 am c5912acc: Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread
Merge commit 'c5912acc04226a8f9377d1aad50de8d3f883854c' into gingerbread-plus-aosp

* commit 'c5912acc04226a8f9377d1aad50de8d3f883854c':
  Disable the access unit timeout temporarily while a seek operation is in progress.
2010-10-08 10:35:53 -07:00
Gilles Debunne
87003cec26 am 56e9b8eb: Merge "Long press with trackball selects word under cursor." into gingerbread
Merge commit '56e9b8ebb20a992a80696f933a2225544670ef8b' into gingerbread-plus-aosp

* commit '56e9b8ebb20a992a80696f933a2225544670ef8b':
  Long press with trackball selects word under cursor.
2010-10-08 10:19:22 -07:00
James Dong
b2df56fcf6 Merge "Name the writer threads" into gingerbread 2010-10-08 10:06:22 -07:00
Andreas Huber
3389b28cd0 Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread 2010-10-08 10:01:37 -07:00
Gilles Debunne
285bb1b8ab Merge "Long press with trackball selects word under cursor." into gingerbread 2010-10-08 09:22:29 -07:00
Eric Laurent
04315be21c am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread
Merge commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5' into gingerbread-plus-aosp

* commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5':
  Added getter for session Id to AudioSink
2010-10-08 08:30:03 -07:00
Eric Laurent
740f0561f2 Merge "Added getter for session Id to AudioSink" into gingerbread 2010-10-08 08:28:08 -07:00
Andreas Huber
71a597b5ee am bb245d35: Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread
Merge commit 'bb245d35b6e81d750a91815543973b0a5976352b' into gingerbread-plus-aosp

* commit 'bb245d35b6e81d750a91815543973b0a5976352b':
  Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.
2010-10-08 08:17:54 -07:00