28130 Commits

Author SHA1 Message Date
Brad Fitzpatrick
ca1db5ae68 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
Brad Fitzpatrick
dd644c179c Fallback to SharedPreferences$Editor.commit() when no apply() exists.
Gingerbread widened the SharedPreferences.Editor interface, adding an
apply() method.  Most people don't implement this interface
themselves, but a couple apps do.

A few spots in the core framework take a SharedPreferences[.Editor]
from apps, which might be a pre-Gingerbread implementation without an
apply() method.  This patch makes sure we never depend on the presence
of an apply() method, falling back to commit() if apply() isn't
available.

Change-Id: I32693ac9227a60b694526a26a30234fb17a40581
2010-10-10 15:26:24 -07:00
Xavier Ducrohet
ceb3aae348 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
4e1658afb8 Merge "Avoid pre-processing images when they won't be used" into gingerbread 2010-10-10 15:14:34 -07:00
Jeff Brown
41aabeb513 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
1e6a3a53fc Merge "Added more robust tracking and cancelation of events." into gingerbread 2010-10-10 14:47:57 -07:00
Jeff Brown
b699726018 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
0acb0d7a4b 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
b72a335a7f Merge "Voice input replaces selected text." into gingerbread 2010-10-10 14:01:10 -07:00
Mike Lockwood
2d39374f08 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
66e606040a Merge "GPS: More HAL initialization cleanup" into gingerbread 2010-10-10 13:13:16 -07:00
Mike Lockwood
4270237def GPS: More HAL initialization cleanup
BUG: 3082940

Change-Id: Idd584ab8fe4512aae0769ecd1274c55d6ea2e5e7
Signed-off-by: Mike Lockwood <lockwood@google.com>
2010-10-10 16:04:18 -04:00
Wink Saville
83d97f4604 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
Gilles Debunne
e507a9e4af Voice input replaces selected text.
Bug 3068128

Hiding controllers no longer stops text selection.

Change-Id: Ie00c99948b3a14ce8a4a2a93c064c0635cadc993
2010-10-10 12:44:18 -07:00
Wink Saville
96619f9f06 Merge "Add some error-case logging." into gingerbread 2010-10-10 12:27:34 -07:00
Irfan Sheriff
e843dea8e8 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
390aceaf53 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
7efff5c4c5 Merge "fix getmacaddress race condition (don't auto-merge)" into gingerbread 2010-10-10 12:21:51 -07:00
Mindy Pereira
7a64e3a6f3 DO NOT MERGE Set the cap at alpha to 80% of the total available.
No matter how much the user drags, the alpha like the height
should not get greater than a max and that max is 80% of what
is available in the image.

Change-Id: I57d181d6ea685461a44ed3ee29f83a675bc07fbc
2010-10-10 12:18:01 -07:00
Brad Fitzpatrick
b3ffd4adcc 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
5a41b3f8aa 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
df5122147c Merge "Fix startDtmf." into gingerbread 2010-10-10 11:38:39 -07:00
John Wang
864032f951 Fix startDtmf.
Call correct startDtmf() function.

Bug: 3033030

Change-Id: Ia90311ac5d2e4b070a28533c865c81dc90326557
2010-10-10 11:36:05 -07:00
Robert Greenwalt
572172befb Add some error-case logging.
Turning off all debug logging is a good thing, but it leaves us blind when errors come in.
bug:3075537

Change-Id: I8a4e7f2ce094574ec45cec268bdbc46449540c9f
2010-10-10 11:26:41 -07:00
Brad Fitzpatrick
3ed792d59c Merge "Don't perform DNS lookup in android.net.Proxy.isLocalHost" 2010-10-10 11:15:27 -07:00
Gilles Debunne
2da9338cb7 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
d14230f1c7 Merge "Made paste work in ExtractEditText" into gingerbread 2010-10-10 10:51:52 -07:00
Mike Lockwood
748b413e94 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
1c3ef78782 Merge "GPS: Do not call sGpsInterface->init() multiple times" into gingerbread 2010-10-09 17:15:54 -07:00
Mike Lockwood
b6e5fa895c GPS: Do not call sGpsInterface->init() multiple times
Change-Id: I5f2b55959bd67864168690c1fe619e55edc18268
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-09 20:14:33 -04:00
Chung-yih Wang
833db40866 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
dc2e5208e2 Merge "Do not release the wifi lock if the screen is off." into gingerbread 2010-10-08 23:25:11 -07:00
Gilles Debunne
f8d8149501 Made paste work in ExtractEditText
Bug 3064925

Instead of always passing the menu item to the original TextView, do that only
for the 'Select word' option. More ExtractEditText magic, but this ZBB so...

Change-Id: Ic4cb0526dbb9711e2f13a916b997f480307dcad1
2010-10-08 18:23:49 -07:00
Chung-yih Wang
c7fda188ae Do not release the wifi lock if the screen is off.
We need to be able to receive calls if the device is able to
reassociate with any AP later on.

Change-Id: Ib7aafb98386bf250ed9b5ec0a5b519594efa1649
2010-10-09 08:37:40 +08:00
Scott Main
4c2c62fe08 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
bed5af7ebc 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
42dd7ec9f0 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
37c8ad779f 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
a827d7bc34 Merge "Other improvements to text cursor movement." into gingerbread 2010-10-08 17:14:45 -07:00
Mindy Pereira
13a81aad3d Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread 2010-10-08 17:10:21 -07:00
Scott Main
456fe3b337 add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Change-Id: If1a33d5f5ee1f3b39c5592748e3d584e060b7278
2010-10-08 17:06:29 -07:00
Mindy Pereira
f6859c3da7 DO NOT MERGE Limit the height of the pull glow.
Event when the user keeps pulling, should NEVER get bigger than
the max height (~2list items tall).
Fixes b/3074337  Overscroll glow can be stretched indefinitely

Change-Id: Ifc30d4c907d432faf9ee10ddc20bcc8f50b21f81
2010-10-08 17:04:04 -07:00
Scott Main
59d5d96666 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
3d265b5775 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
1d58e52a59 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
7255288755 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
Scott Main
50f86c6520 docs: a few style adjustments to admin doc
Change-Id: I1ea2416f1f26835b1111aad65cc519dd8d56e099
2010-10-08 16:12:32 -07:00
Gilles Debunne
380b604a03 Other improvements to text cursor movement.
Paste happened on pressed position instead of current cursor location
when triggered by a long touch.

Change-Id: I86900f2bbb93390d3efa756aeebb424c4ae7e19b
2010-10-08 16:12:11 -07:00
Andreas Huber
cac43e8a2c 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
7bfac24dcb 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