Gilles Debunne
a20e873476
resolved conflicts for merge of d7d47941 to master
...
Change-Id: I4ec47b9461c5ba350adfc257bc1820ee079b751e
2010-10-10 18:45:23 -07:00
Dianne Hackborn
50d3fa72d8
am d5423321: am 9934fa77: Merge "Fix issue #3074745 : Crash in system process" into gingerbread
...
Merge commit 'd5423321b920be10c00fbcbc5a702f15e00693a5'
* commit 'd5423321b920be10c00fbcbc5a702f15e00693a5':
Fix issue #3074745 : Crash in system process
2010-10-10 17:47:01 -07:00
Brad Fitzpatrick
8775eae941
am b323559b: am a2a1ca42: Merge "DropBoxManager.Entry implements Closeable" into gingerbread
...
Merge commit 'b323559b13d8c8ced586f919c5ce083c1f5b74bc'
* commit 'b323559b13d8c8ced586f919c5ce083c1f5b74bc':
DropBoxManager.Entry implements Closeable
2010-10-10 17:46:10 -07:00
Jeff Brown
325b05f611
am b13998f2: am d00b4386: Merge "Clarify some comments on individual key codes." into gingerbread
...
Merge commit 'b13998f2b482ff0ebe96cd683801758a01d10799'
* commit 'b13998f2b482ff0ebe96cd683801758a01d10799':
Clarify some comments on individual key codes.
2010-10-10 17:45:25 -07:00
Gilles Debunne
7499a1ca68
resolved conflicts for merge of 5d146549 to master
...
Change-Id: I96c720b9afd4a28d27ed00020551f791e8aefa2b
2010-10-10 16:50:28 -07:00
Romain Guy
f673689d68
Merge "Reset the dirty region after drawing in hardware."
2010-10-10 15:49:14 -07:00
Romain Guy
fd5072606b
Reset the dirty region after drawing in hardware.
...
Change-Id: I687419f2a95d5d7c51913467bd80249244102725
2010-10-10 15:46:46 -07:00
Dianne Hackborn
615e2fa175
am b77455ee: am 78d68836: Implement tracking of package install times.
...
Merge commit 'b77455ee290691b036ac79236a93e57ff294ef0c'
* commit 'b77455ee290691b036ac79236a93e57ff294ef0c':
Implement tracking of package install times.
2010-10-10 14:20:34 -07:00
Gilles Debunne
91a359e0d1
Merge "resolved conflicts for merge of bd38710b to master"
2010-10-10 14:00:43 -07:00
Gilles Debunne
a89af70cdc
resolved conflicts for merge of bd38710b to master
...
Change-Id: I3489b6909ce2a215318d45f809b82579503fd733
2010-10-10 13:55:49 -07:00
Doug Zongker
ee04af3ed4
add a local filename column to download queries
...
Some users of the download API (eg system update) need to get the
actual local filename of a downloaded file, not just a content URI.
Change-Id: I877e2776e778c1712f654ba5c840bfe6ed3fe60f
2010-10-10 13:29:09 -07:00
Jeff Brown
d5da367024
am 22cb4ef8: am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread
...
Merge commit '22cb4ef8ce9c4d5536ac5cee5c40b82bfa56ccc5'
* commit '22cb4ef8ce9c4d5536ac5cee5c40b82bfa56ccc5':
Switch Looper back to using poll() instead of epoll().
2010-10-10 12:52:40 -07:00
Adam Powell
707fb0e0e5
am b3616395: am f15dfbec: Merge "Fix bug 3071869 - text anchors are now treated as application sub-panels." into gingerbread
...
Merge commit 'b3616395660498ecfd2099b5ffcb9ff74e5aeaee'
* commit 'b3616395660498ecfd2099b5ffcb9ff74e5aeaee':
Fix bug 3071869 - text anchors are now treated as application sub-panels.
2010-10-10 11:16:32 -07:00
Brad Fitzpatrick
38051bc018
am 6a15f0d7: am 6275dbbe: Merge "Quiet unnecessary debug logging." into gingerbread
...
Merge commit '6a15f0d7c7ed74e086f4d3a7014ed724a2b18023'
* commit '6a15f0d7c7ed74e086f4d3a7014ed724a2b18023':
Quiet unnecessary debug logging.
2010-10-10 11:16:16 -07:00
Brad Fitzpatrick
71ce18b0b7
am b8d40d26: am 30f5c8fe: More DropBoxManager javadoc love.
...
Merge commit 'b8d40d263bc18d1defc1e6980e8f922df8f8f321'
* commit 'b8d40d263bc18d1defc1e6980e8f922df8f8f321':
More DropBoxManager javadoc love.
2010-10-10 11:15:12 -07:00
Brad Fitzpatrick
ceda3a972c
am 992a9e50: am fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread
...
Merge commit '992a9e507fb1f8da7358b4d805c034d934eb1810'
* commit '992a9e507fb1f8da7358b4d805c034d934eb1810':
DropBox.Entry javadoc syntax fix
2010-10-10 11:14:56 -07:00
Wu-cheng Li
e1199e382f
am 9df14085: am 29332971: Merge "Add javadoc for display orientation." into gingerbread
...
Merge commit '9df140851375a977ad99390d71edf8b4a8382fd4'
* commit '9df140851375a977ad99390d71edf8b4a8382fd4':
Add javadoc for display orientation.
2010-10-08 18:28:38 -07:00
Adam Powell
d856b1ce92
resolved conflicts for merge of 86b50028 to master
...
Change-Id: I3468e67ac17f861c5491717337c27cd49bd5287e
2010-10-08 18:23:49 -07:00
Dianne Hackborn
ca33268ef8
am 18e225b4: am bfba7cab: Fix issue #3001362 : API REVIEW: android.view.InputQueue.Callback
...
Merge commit '18e225b42b77c48efa63f245a4137c5f74302e26'
* commit '18e225b42b77c48efa63f245a4137c5f74302e26':
Fix issue #3001362 : API REVIEW: android.view.InputQueue.Callback
2010-10-08 17:59:52 -07:00
Dianne Hackborn
d7dccd2611
am 55f1b0b8: am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread
...
Merge commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f'
* commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f':
Make Activity.removeDialog() less strict.
2010-10-08 17:58:35 -07:00
Dianne Hackborn
fa9921e4bc
am e89bf502: am ef083ec0: Merge "Work on issue #3062691 : GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread
...
Merge commit 'e89bf50261902bf263887923bf95595ec8eae069'
* commit 'e89bf50261902bf263887923bf95595ec8eae069':
Work on issue #3062691 : GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
2010-10-08 17:57:35 -07:00
Amith Yamasani
0594476ffa
SearchView: Add some more listeners, IME dismiss improvements and focus control.
...
Addresses following bugs:
3067611 : Submit button incorrectly displayed
3064371 : Callback to report suggestion click
3008580 : Setting initial focus
The SearchView will take initial focus now, reverting an earlier change. If
you don't want it to take initial focus, then you must requestFocus on a
different view on launching the activity, since the initial focus is desirable
in other cases. This is normal behavior for all EditText widgets and SearchView
shouldn't have a different behavior.
2010-10-08 15:49:37 -07:00
Mike Dodd
9568a5ab2e
Merge "HardwareRenderer: When throwing an exception because of an EGL error, include the specific error."
2010-10-08 15:33:45 -07:00
Vasu Nori
ee7e28e20d
Merge "when printing requery on UI warning, include additional info"
2010-10-08 14:50:59 -07:00
Vasu Nori
f0808f810e
when printing requery on UI warning, include additional info
...
this hsould help figure out which module is doing query on UI thread.
Change-Id: If3062a35fa1fb50063b678c3c9311d6b1504fa9b
2010-10-08 14:48:48 -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
Mike Dodd
5d3e2ea6f3
HardwareRenderer: When throwing an exception because of an EGL
...
error, include the specific error.
Change-Id: I8e4b0cdbc207824df4f4bb55c3b379b0ee4aeec2
2010-10-08 14:43:16 -07:00
Gilles Debunne
50662f5f04
Merge "TextView cursor and selection improvements." into gingerbread
2010-10-08 14:42:42 -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
Irfan Sheriff
8163315095
Merge "Use LinkProperties for IP and proxy configuration"
2010-10-08 14:09:49 -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
Adam Powell
2fbf4de64f
Holo theme progress and assets!
...
* Light and dark dialogs
* Checkboxes and radio buttons
* Toggle buttons
Warning! This is still a work in progress. This does not include final metrics.
Some assets (specifically dialogs) are currently misaligned.
2010-10-08 13:25:17 -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
Irfan Sheriff
96ca91761e
Use LinkProperties for IP and proxy configuration
...
Change-Id: I4ae817fb00141e9a742216b7fd02dca1ed228270
2010-10-08 12:41:11 -07:00
Dianne Hackborn
c4dfe3d5c0
am 92d29c66: am a2a0a98a: Merge "Fix NPE if there is no accelerometer." into gingerbread
...
Merge commit '92d29c66f5cb69627172d21057e672eaba2eb03f'
* commit '92d29c66f5cb69627172d21057e672eaba2eb03f':
Fix NPE if there is no accelerometer.
2010-10-08 12:39:14 -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
Dianne Hackborn
a1b0d6966e
resolved conflicts for merge of efa4f7f8 to master
...
Change-Id: I00dff76594326a6f6e69515a9cba673602ed269d
2010-10-08 11:09:38 -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
Fred Quintana
c6a69559cb
Add getCurrentSyncs() to the SDK, which replaces the deprecated
...
getCurrentSync().
Change-Id: I1112df41e48ed93ff4c0c5af4825dbdce0c4cccc
2010-10-08 09:50:45 -07:00
Gilles Debunne
fdcd2660ec
Merge "resolved conflicts for merge of ba04dbc6 to master"
2010-10-08 09:20:57 -07:00
Patrick Scott
5fe721f5f5
Fix NPE in addMessageToConsole.
...
CallbackProxy should always check for client during handleMessage.
Bug: 3060412
Change-Id: I0a84fa2ce21cc46d9b215b18a700119c7c12a7f2
2010-10-08 10:06:07 -04: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
Gilles Debunne
cf1e925aa1
resolved conflicts for merge of ba04dbc6 to master
...
Change-Id: I175aa21ef01b98b0c3c46aea0b754d14984128b9
2010-10-07 20:46:03 -07:00