12206 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
2aaa1ce176 Merge "Hold partial wakelock during shutdown to avoid entering sleep" 2010-10-10 18:41:58 -07:00
Gilles Debunne
1457bb0ef6 am 6b8bdaa9: New AppsPermission and market style
Merge commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc' into gingerbread-plus-aosp

* commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc':
  New AppsPermission and market style
2010-10-10 18:08:25 -07:00
Gilles Debunne
6b8bdaa9c8 New AppsPermission and market style
Bug 3067333

Change-Id: Ibbf444cfd9b1e2d7b51f4194d57c6dee30ac18ee
2010-10-10 17:57:55 -07:00
Jean-Baptiste Queru
89fbcd72fb resolved conflicts for merge of c2894474 to gingerbread-plus-aosp
Change-Id: Ie00785e37809b677d6e8ab44c47e1f26037793d2
2010-10-10 17:45:45 -07:00
Imre Sunyi
9239612870 Support showing "Cold" battery health.
The Linux kernel supports reporting "cold" battery health to sysfs.
Android framework has not implemented this and it defaults to "unknown"
This adds handling the cold battery health.

Change-Id: Idcc156aae6aabce73391081143f79d052edf332e
2010-10-10 17:20:24 -07:00
Justin Ho
90390e6918 am 5c61228b: Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread
Merge commit '5c61228bfc0fb26ae2e975cb5c6c74debf6233df' into gingerbread-plus-aosp

* commit '5c61228bfc0fb26ae2e975cb5c6c74debf6233df':
  Updated media playback controls, unlock screen, misc framework assets
2010-10-10 16:38:14 -07:00
Justin Ho
5c61228bfc Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread 2010-10-10 16:30:01 -07:00
Justin Ho
5b640bdee9 Updated media playback controls, unlock screen, misc framework assets
Change-Id: Ib7ee3d0ad81f2f27c33dcf698d5270b464d4430e
2010-10-10 16:07:22 -07:00
Vasu Nori
a23964f9a1 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
b8f7a4831a Merge "bug:3082865 don't use IN to construct sql to delete downloads" into gingerbread 2010-10-10 15:51:42 -07:00
Vasu Nori
e7be6bda2c bug:3082865 don't use IN to construct sql to delete downloads
DownloadManager should not use IN clause when constructing
SQL to delete downloaded files Dowload app.
Lexer code in Download app doesn't know how to parse it.
Real fix is to fix Lexer.
But seriously real fix is to get rid of this complexity -
that I am planning for next version.

also, the following 2 are identical, in terms of SQL performance
   WHERE _id IN (?, ?, ?)
   WHERE (_id = ? OR _id = ? OR _id = ?)

Change-Id: Icca659a17c412247a193879e8d2f34e1b43ec9e5
2010-10-10 15:46:51 -07:00
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
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
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
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
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
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
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
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
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
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
Brad Fitzpatrick
4216c3c3f7 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
Brad Fitzpatrick
9acdeb99c5 Minor SharedPreference clean-up.
Make a member final, line up some comments, and also cache the
expected stat size, not just the mtime.

Change-Id: Ifcc37bd3ab99787280e506deb682200a16da512e
2010-10-08 15:34:08 -07:00
Steve Howard
7c08b70c96 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
d7d47941a9 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
d8d60da616 Merge "Update DownloadManager API to support bulk actions." into gingerbread 2010-10-08 14:42:43 -07:00
Gilles Debunne
50662f5f04 Merge "TextView cursor and selection improvements." into gingerbread 2010-10-08 14:42:42 -07:00
Steve Howard
64c48b8842 Update DownloadManager API to support bulk actions.
This includes querying by ID, removing and restarting downloads (the
latter is not a public API).  The methods all use varargs to support
this without undue syntactic pain.

Change-Id: I768005c539d2395cf26587d3a8c425cd01ad9cd2
2010-10-08 14:14:07 -07:00
Dianne Hackborn
d5423321b9 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
9934fa77ef Merge "Fix issue #3074745: Crash in system process" into gingerbread 2010-10-08 14:05:01 -07:00
Gilles Debunne
528c64887e TextView cursor and selection improvements.
Insertion cursor handle no longer appears on empty text views (Bug 3075988).

Tapping on an unfocused TextView moves the insertion point at tapped position.

Bug fixes for trackball initiated text selection.

Change-Id: Ief246fd9a9f1eb745dcf9f0605e2ce53b5563f01
2010-10-08 14:02:37 -07:00
Brad Fitzpatrick
b323559b13 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
Dianne Hackborn
f47d8f272c Fix issue #3074745: Crash in system process
Also some tweaks to battery history collection to hopefully
improve the data we have.

Change-Id: I178a54a8c2d15cf38dcceaeef939406f50059aa4
2010-10-08 13:00:15 -07:00
Brad Fitzpatrick
a2a1ca42bc Merge "DropBoxManager.Entry implements Closeable" into gingerbread 2010-10-08 12:59:30 -07:00
Jeff Brown
b13998f2b4 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
d00b4386ae Merge "Clarify some comments on individual key codes." into gingerbread 2010-10-08 12:44:43 -07:00
Mindy Pereira
ab70a98b0e 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
Mindy Pereira
612d570a6f DO NOT MERGE Adjust amount pull effects the glow and edge decay.
Edge decay is now based on the remaining height of the glow so that
as the glow reduces, the edge will reduce and not disappear entirely
before the glow is gone.

Change-Id: I03376ee3807e21ce6ac74c0cfad713b7fd5e4520
2010-10-08 11:45:57 -07:00
Gilles Debunne
5d1465490c 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
Brad Fitzpatrick
cc792c4149 DropBoxManager.Entry implements Closeable
Change-Id: I61716c06b92fa1b9b5b271b5805550bdb2d51b46
2010-10-08 10:17:03 -07:00
Gilles Debunne
c873112810 Long press with trackball selects word under cursor.
Bug 3068305

Change-Id: Ib37fc98a61efdf3fbfccbb2174e2dbdbcb1a240e
2010-10-07 20:59:09 -07:00
Jeff Brown
224d4a1535 Clarify some comments on individual key codes.
Change-Id: I03cce0ad69aaab5b71e5017982b01afd27285d2f
2010-10-07 20:28:53 -07:00