Brad Fitzpatrick
764437aa9e
am 4216c3c3: am a4682ed7: Merge "Minor SharedPreference clean-up." into gingerbread
...
Merge commit '4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635'
* commit '4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635':
Minor SharedPreference clean-up.
2010-10-10 19:13:24 -07:00
Jean-Baptiste Queru
fae998c860
resolved conflicts for merge of 7c08b70c to master
...
Change-Id: Ifef07cf23de35db545774d0dee327c2165f8b088
2010-10-10 19:02:41 -07:00
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
Kenny Root
5bc3addb45
am 0689b60b: am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread
...
Merge commit '0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124'
* commit '0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124':
Symlink application lib directory when on SD card
2010-10-10 14:19:52 -07:00
Hung-ying Tyan
3d59480dc2
am ea445758: am 08faac3c: Unhide SIP API.
...
Merge commit 'ea445758efba6b728d5e597402e9d9538f3ef451'
* commit 'ea445758efba6b728d5e597402e9d9538f3ef451':
Unhide SIP API.
2010-10-10 14:19:29 -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
Adam Powell
b462f88f1e
Merge "Fix 3082859 - missing mdpi text handle assets"
2010-10-10 13:46:08 -07:00
Adam Powell
6587e57a68
Fix 3082859 - missing mdpi text handle assets
...
Change-Id: I94fda1db4ef358d21f63ad057b088d68133ab4b4
2010-10-10 13:43:01 -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
Gilles Debunne
4f7bb9ae9f
am c6faec80: am 4a962a06: Merge "Removing \'last\' of red cross asset." into gingerbread
...
Merge commit 'c6faec80d26a352c86317cbf92174c8e5cd8f0c5'
* commit 'c6faec80d26a352c86317cbf92174c8e5cd8f0c5':
Removing 'last' of red cross asset.
2010-10-10 12:52:55 -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
Gilles Debunne
441d198023
am 5e3329b5: am e86a6b2a: Merge "Removed unused and broken screen_progress" into gingerbread
...
Merge commit '5e3329b5fac117ed49c9c3ca2919a4b1533612c4'
* commit '5e3329b5fac117ed49c9c3ca2919a4b1533612c4':
Removed unused and broken screen_progress
2010-10-10 11:15:28 -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
Jean-Baptiste Queru
264c2cfe4d
resolved conflicts for merge of 5df4b5a7 to master
...
Change-Id: Ib1ed63f79c4a094b1d4ba8ba74ee2bd68a35bfd2
2010-10-10 11:09:45 -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
Kenny Root
06f89ca9b1
am 36455d03: am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread
...
Merge commit '36455d03256024981b1bf21557722a010b5e092a'
* commit '36455d03256024981b1bf21557722a010b5e092a':
Add MountService tests and fix a bug it found
2010-10-08 17:57:55 -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
Adam Powell
54ca811b29
Merge "Fix alert dialog layout size in landscape"
2010-10-08 17:10:24 -07:00
Adam Powell
4fb17b0490
Fix alert dialog layout size in landscape
...
Change-Id: Iff5c388655c357e78c0c0e98d718fb7601c2d543
2010-10-08 17:04:39 -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
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
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
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
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
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
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
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
c459622dd1
Merge "Holo theme progress and assets!"
2010-10-08 13:52:55 -07:00