Commit Graph

19113 Commits

Author SHA1 Message Date
Justin Ho
9cfdf64d46 Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread 2010-10-10 16:30:01 -07:00
Vasu Nori
194b50f374 am b8f7a483: Merge "bug:3082865 don\'t use IN to construct sql to delete downloads" into gingerbread
Merge commit 'b8f7a4831ac26d0447fd8a2982416b2627a286b5' into gingerbread-plus-aosp

* commit 'b8f7a4831ac26d0447fd8a2982416b2627a286b5':
  bug:3082865 don't use IN to construct sql to delete downloads
2010-10-10 15:54:26 -07:00
Vasu Nori
ad96c8bba6 Merge "bug:3082865 don't use IN to construct sql to delete downloads" into gingerbread 2010-10-10 15:51:42 -07:00
Brad Fitzpatrick
e0ab7c5c70 am dd644c17: Fallback to SharedPreferences.commit() when no apply() exists.
Merge commit 'dd644c179c1bf47d82d776d7f644e4fc1467159d' into gingerbread-plus-aosp

* commit 'dd644c179c1bf47d82d776d7f644e4fc1467159d':
  Fallback to SharedPreferences$Editor.commit() when no apply() exists.
2010-10-10 15:30:55 -07:00
Xavier Ducrohet
594c08ff6d am 4e1658af: Merge "Avoid pre-processing images when they won\'t be used" into gingerbread
Merge commit '4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d' into gingerbread-plus-aosp

* commit '4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d':
  Avoid pre-processing images when they won't be used
2010-10-10 15:19:58 -07:00
Xavier Ducrohet
511f223765 Merge "Avoid pre-processing images when they won't be used" into gingerbread 2010-10-10 15:14:34 -07:00
Jeff Brown
a16d82c248 am 1e6a3a53: Merge "Added more robust tracking and cancelation of events." into gingerbread
Merge commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32' into gingerbread-plus-aosp

* commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32':
  Added more robust tracking and cancelation of events.
2010-10-10 14:50:38 -07:00
Jeff Brown
f817a6e0fd Merge "Added more robust tracking and cancelation of events." into gingerbread 2010-10-10 14:47:57 -07:00
Jeff Brown
90f0cee685 Added more robust tracking and cancelation of events.
This change fixes several issues where events would be dropped in the
input dispatch pipeline in such a way that the dispatcher could not
accurately track the state of the input device.

Given more robust tracking, we can now also provide robust cancelation
of input events in cases where an application might otherwise become
out of sync with the event stream due to ANR, app switch, policy decisions,
or forced focus transitions.

Pruned some of the input dispatcher log output.

Moved the responsibility for calling intercept*BeforeQueueing into
the input dispatcher instead of the input reader and added support for
early interception of injected events for events coming from trusted
sources.  This enables behaviors like injection of media keys while
the screen is off, haptic feedback of injected virtual keys, so injected
events become more "first class" in a way.

Change-Id: Iec6ff1dd21e5f3c7feb80ea4feb5382bd090dbd9
2010-10-10 14:45:51 -07:00
Gilles Debunne
badc41e13a am b72a335a: Merge "Voice input replaces selected text." into gingerbread
Merge commit 'b72a335a7f11176838d2d12e7295344c092c62ac' into gingerbread-plus-aosp

* commit 'b72a335a7f11176838d2d12e7295344c092c62ac':
  Voice input replaces selected text.
2010-10-10 14:04:25 -07:00
Gilles Debunne
c754c60a88 Merge "Voice input replaces selected text." into gingerbread 2010-10-10 14:01:10 -07:00
Mike Lockwood
047339e91c am 66e60604: Merge "GPS: More HAL initialization cleanup" into gingerbread
Merge commit '66e606040a521b81033ff75025620436c050c82e' into gingerbread-plus-aosp

* commit '66e606040a521b81033ff75025620436c050c82e':
  GPS: More HAL initialization cleanup
2010-10-10 13:16:22 -07:00
Mike Lockwood
dc798229c6 Merge "GPS: More HAL initialization cleanup" into gingerbread 2010-10-10 13:13:16 -07:00
Wink Saville
471d762597 am 96619f9f: Merge "Add some error-case logging." into gingerbread
Merge commit '96619f9f0653a5c7f407c52ab565b5ddf23ad696' into gingerbread-plus-aosp

* commit '96619f9f0653a5c7f407c52ab565b5ddf23ad696':
  Add some error-case logging.
2010-10-10 12:47:18 -07:00
Wink Saville
5f8993277a Merge "Add some error-case logging." into gingerbread 2010-10-10 12:27:34 -07:00
Irfan Sheriff
b2b3f12fd7 am 7efff5c4: Merge "fix getmacaddress race condition (don\'t auto-merge)" into gingerbread
Merge commit '7efff5c4c571d1a0111e31d73a87d27e1fae9de6' into gingerbread-plus-aosp

* commit '7efff5c4c571d1a0111e31d73a87d27e1fae9de6':
  fix getmacaddress race condition (don't auto-merge)
2010-10-10 12:25:15 -07:00
Mindy Pereira
4df8ed2349 am 7a64e3a6: DO NOT MERGE Set the cap at alpha to 80% of the total available.
Merge commit '7a64e3a6f3e9f4de9cb097f604187d06268c23be' into gingerbread-plus-aosp

* commit '7a64e3a6f3e9f4de9cb097f604187d06268c23be':
  DO NOT MERGE Set the cap at alpha to 80% of the total available.
2010-10-10 12:22:46 -07:00
Irfan Sheriff
ba18dd9fa9 Merge "fix getmacaddress race condition (don't auto-merge)" into gingerbread 2010-10-10 12:21:51 -07:00
Brad Fitzpatrick
e9a1e57d04 am 3ed792d5: Merge "Don\'t perform DNS lookup in android.net.Proxy.isLocalHost"
Merge commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090' into gingerbread-plus-aosp

* commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090':
  Don't perform DNS lookup in android.net.Proxy.isLocalHost
2010-10-10 11:49:43 -07:00
John Wang
a5c9951793 am df512214: Merge "Fix startDtmf." into gingerbread
Merge commit 'df5122147c6e1c988c6a8504e71501cbbece5298' into gingerbread-plus-aosp

* commit 'df5122147c6e1c988c6a8504e71501cbbece5298':
  Fix startDtmf.
2010-10-10 11:42:10 -07:00
John Wang
46e92cb3d3 Merge "Fix startDtmf." into gingerbread 2010-10-10 11:38:39 -07:00
Brad Fitzpatrick
fe80b253ba Merge "Don't perform DNS lookup in android.net.Proxy.isLocalHost" 2010-10-10 11:15:27 -07:00
Gilles Debunne
3f6f10e957 am d14230f1: Merge "Made paste work in ExtractEditText" into gingerbread
Merge commit 'd14230f1c7aa5073db9d291f8fbd6da5491955b9' into gingerbread-plus-aosp

* commit 'd14230f1c7aa5073db9d291f8fbd6da5491955b9':
  Made paste work in ExtractEditText
2010-10-10 11:05:38 -07:00
Gilles Debunne
c486fcc633 Merge "Made paste work in ExtractEditText" into gingerbread 2010-10-10 10:51:52 -07:00
Mike Lockwood
60aa1ca354 am 1c3ef787: Merge "GPS: Do not call sGpsInterface->init() multiple times" into gingerbread
Merge commit '1c3ef78782cb3461ef83e0c337d03b6f677c94e5' into gingerbread-plus-aosp

* commit '1c3ef78782cb3461ef83e0c337d03b6f677c94e5':
  GPS: Do not call sGpsInterface->init() multiple times
2010-10-09 17:20:56 -07:00
Mike Lockwood
04d921fa29 Merge "GPS: Do not call sGpsInterface->init() multiple times" into gingerbread 2010-10-09 17:15:54 -07:00
Chung-yih Wang
184a3f3cd6 am dc2e5208: Merge "Do not release the wifi lock if the screen is off." into gingerbread
Merge commit 'dc2e5208e2b448a2c481d726818de79ea6a49783' into gingerbread-plus-aosp

* commit 'dc2e5208e2b448a2c481d726818de79ea6a49783':
  Do not release the wifi lock if the screen is off.
2010-10-08 23:30:05 -07:00
Chung-yih Wang
ea01cfbb53 Merge "Do not release the wifi lock if the screen is off." into gingerbread 2010-10-08 23:25:11 -07:00
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