summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 66358e24: am 9dab667e: Force a crash under conditions where white square ↵Jason Sams2009-11-244-3/+32
|\ | | | | | | | | | | | | | | | | bug in all apps is likely to occur. Merge commit '66358e24a6bbc2017c2edd921a64e616b4c9cac4' into eclair-mr2-plus-aosp * commit '66358e24a6bbc2017c2edd921a64e616b4c9cac4': Force a crash under conditions where white square bug in all apps is likely to occur.
| * am 9dab667e: Force a crash under conditions where white square bug in all ↵Jason Sams2009-11-244-3/+32
| |\ | | | | | | | | | | | | | | | | | | | | | | | | apps is likely to occur. Merge commit '9dab667e03632181e487a04a8a170b3fa0bd5037' into eclair-mr2 * commit '9dab667e03632181e487a04a8a170b3fa0bd5037': Force a crash under conditions where white square bug in all apps is likely to occur.
| | * Force a crash under conditions where white square bug in all apps is likely ↵Jason Sams2009-11-244-3/+32
| | | | | | | | | | | | to occur.
* | | am 2464acc6: moved the gdata library to vendor/googleFred Quintana2009-11-2415-1684/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '2464acc6da6393f0163894094468f68b8e496cea' into eclair-mr2-plus-aosp * commit '2464acc6da6393f0163894094468f68b8e496cea': moved the gdata library to vendor/google
| * | moved the gdata library to vendor/googleFred Quintana2009-11-2415-1684/+1
| | |
* | | am 82d4b5cc: am 99f7b56f: Merge change Iefdb6f97 into eclairTrevor Johns2009-11-241-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '82d4b5ccaf5518ed9286d89e60ac9a595239ac35' into eclair-mr2-plus-aosp * commit '82d4b5ccaf5518ed9286d89e60ac9a595239ac35': Fixing minor doc typo in android.widget.SimpleCursorAdapter.
| * | am 99f7b56f: Merge change Iefdb6f97 into eclairTrevor Johns2009-11-241-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5' into eclair-mr2 * commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5': Fixing minor doc typo in android.widget.SimpleCursorAdapter.
| | * Merge change Iefdb6f97 into eclairAndroid (Google) Code Review2009-11-241-1/+1
| | |\ | | | | | | | | | | | | | | | | * changes: Fixing minor doc typo in android.widget.SimpleCursorAdapter.
| | | * Fixing minor doc typo in android.widget.SimpleCursorAdapter.Trevor Johns2009-11-131-1/+1
| | | | | | | | | | | | | | | | Changed "thelayout" to "the layout".
* | | | merge from open-source masterJean-Baptiste Queru2009-11-241-3/+0
|\ \ \ \
| * | | | remove a few classes from the preloaded listJean-Baptiste Queru2009-11-171-3/+0
| | | | |
* | | | | am ecfc0eba: Fix soft keyboard dismissing itself when zooming into a ↵Leon Scroggins2009-11-241-20/+26
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textfield in browser. Merge commit 'ecfc0eba609f88579ea5b70c57e6763ee3a28e5d' into eclair-mr2-plus-aosp * commit 'ecfc0eba609f88579ea5b70c57e6763ee3a28e5d': Fix soft keyboard dismissing itself when zooming into a textfield in browser.
| * | | | Fix soft keyboard dismissing itself when zooming into a textfield in browser.Leon Scroggins2009-11-241-20/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We remove the WebTextView while zooming. If the WebTextView ended up offscreen, we remove it completely, thus hiding the IME. In some cases, however, the WebTextView is only offscreen because the IME overlapped it. Check to see if the IME is showing, and if so, adjust the WebTextView and let it get scrolled into view. Also perform the removal/change in text size inside the method, so it happens in both places. Lastly, do not call didUpdateTextViewBounds if there is no WebTextView. Fix for http://b/issue?id=2266066
* | | | | am 1e914ac7: am 16cc72bd: Fix simulator build.Dave Sparks2009-11-231-3/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1e914ac7fce9523b5a932389798589eba91ca4dd' into eclair-mr2-plus-aosp * commit '1e914ac7fce9523b5a932389798589eba91ca4dd': Fix simulator build.
| * | | | am 16cc72bd: Fix simulator build.Dave Sparks2009-11-231-3/+12
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit '16cc72bdef471ffeee3f61eba8262783de248b04' into eclair-mr2 * commit '16cc72bdef471ffeee3f61eba8262783de248b04': Fix simulator build.
| | * | | Fix simulator build.Dave Sparks2009-11-231-3/+12
| | | | |
* | | | | am ebcb7c31: am 8424ec32: Merge change I0f9a53d4 into eclairDave Sparks2009-11-233-27/+75
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ebcb7c3167e76c19d4721dbc472772744918e868' into eclair-mr2-plus-aosp * commit 'ebcb7c3167e76c19d4721dbc472772744918e868': Set metadata retriever thread group to the caller's group.
| * | | | am 8424ec32: Merge change I0f9a53d4 into eclairDave Sparks2009-11-233-27/+75
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013' into eclair-mr2 * commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013': Set metadata retriever thread group to the caller's group.
| | * | | Merge change I0f9a53d4 into eclairAndroid (Google) Code Review2009-11-233-27/+75
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Set metadata retriever thread group to the caller's group.
| | | * | | Set metadata retriever thread group to the caller's group.Dave Sparks2009-11-233-27/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch modifies the native binder interface to the metadata retriever to pass the caller's thread group across the binder interface. On the server side, the thread scheduler group is set to the caller's scheduler group temporarily and restored after the request has completed. This patch also reverts a previous patch where the priority of the thread was forced to a low priority foreground thread. This should give apps more control over the priority of their metadata retrieval, particularly allow background process to run without hogging the CPU.
* | | | | | am b59573cf: Merge change I06fb08c4 into eclair-mr2Dan Egnor2009-11-233-43/+52
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b59573cf53c8f09ac25fe0bfaf1d7067604ee983' into eclair-mr2-plus-aosp * commit 'b59573cf53c8f09ac25fe0bfaf1d7067604ee983': Expand db_operation logging to prepare for widespread sample collection:
| * | | | | Merge change I06fb08c4 into eclair-mr2Android (Google) Code Review2009-11-233-43/+52
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Expand db_operation logging to prepare for widespread sample collection: - always enable the log, but subsample for queries faster than 100ms - add information about whether it's blocking a main thread - log the entire sql (have not yet added quoted-string-stripping)
| | * | | | | Expand db_operation logging to prepare for widespread sample collection:Dan Egnor2009-11-233-43/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - always enable the log, but subsample for queries faster than 100ms - add information about whether it's blocking a main thread - log the entire sql (have not yet added quoted-string-stripping)
* | | | | | | am f52ebbfc: am 9a219519: Merge change I2d32301b into eclairDave Sparks2009-11-239-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb' into eclair-mr2-plus-aosp * commit 'f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb': Add 4 new notification sounds.
| * | | | | | am 9a219519: Merge change I2d32301b into eclairDave Sparks2009-11-239-0/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9a219519786ce6702c57ec1f1bffe2260fc663a9' into eclair-mr2 * commit '9a219519786ce6702c57ec1f1bffe2260fc663a9': Add 4 new notification sounds.
| | * | | | | Merge change I2d32301b into eclairAndroid (Google) Code Review2009-11-239-0/+4
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add 4 new notification sounds.
| | | * | | | | Add 4 new notification sounds.Dave Sparks2009-11-239-0/+4
| | | | |/ / / | | | |/| | |
* | | | | | | am 6a2500a3: am 39dbb099: Merge change I36176536 into eclairJason Sams2009-11-231-2/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6a2500a330ef41cbfca40827b60e9f5efdf72db7' into eclair-mr2-plus-aosp * commit '6a2500a330ef41cbfca40827b60e9f5efdf72db7': Fix ref counting bug that could cause memory leak in allApps.
| * | | | | | am 39dbb099: Merge change I36176536 into eclairJason Sams2009-11-231-2/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '39dbb099974f2c8e1154f28123e53be14c47a76d' into eclair-mr2 * commit '39dbb099974f2c8e1154f28123e53be14c47a76d': Fix ref counting bug that could cause memory leak in allApps.
| | * | | | | Merge change I36176536 into eclairAndroid (Google) Code Review2009-11-231-2/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix ref counting bug that could cause memory leak in allApps.
| | | * | | | | Fix ref counting bug that could cause memory leak in allApps.Jason Sams2009-11-231-2/+1
| | | | | | | |
* | | | | | | | am cfe90ce4: am 05799981: Fix issue #2281046: Size and pressure don\'t changeDianne Hackborn2009-11-231-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'cfe90ce461eacf3ae6a8556594a0f682a31cfb84' into eclair-mr2-plus-aosp * commit 'cfe90ce461eacf3ae6a8556594a0f682a31cfb84': Fix issue #2281046: Size and pressure don't change
| * | | | | | | am 05799981: Fix issue #2281046: Size and pressure don\'t changeDianne Hackborn2009-11-231-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Merge commit '05799981d8d930e0b929cdb99f9407e3ee18c142' into eclair-mr2 * commit '05799981d8d930e0b929cdb99f9407e3ee18c142': Fix issue #2281046: Size and pressure don't change
| | * | | | | Fix issue #2281046: Size and pressure don't changeDianne Hackborn2009-11-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iadc1d438a494bb1495ee6d93d0dd3b4a491a378f
* | | | | | | am 44e15c44: Some playable/decodable streams have been found in the wild ↵Andreas Huber2009-11-231-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that violate this assertion, let\'s be lenient for now. Merge commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8' into eclair-mr2-plus-aosp * commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8': Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
| * | | | | | Some playable/decodable streams have been found in the wild that violate ↵Andreas Huber2009-11-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this assertion, let's be lenient for now.
* | | | | | | am 1f522294: Merge change I24b0a95d into eclair-mr2Andreas Huber2009-11-231-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1f52229453c3df8eaeda64133bd332b01589354f' into eclair-mr2-plus-aosp * commit '1f52229453c3df8eaeda64133bd332b01589354f': The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
| * | | | | | Merge change I24b0a95d into eclair-mr2Android (Google) Code Review2009-11-231-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
| | * | | | | | The original delay after which we dropped a frame was too aggressive. 40ms ↵Andreas Huber2009-11-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lateness seems more appropriate (about 25fps).
* | | | | | | | am e71a6408: Merge change I1bceff91 into eclair-mr2Andreas Huber2009-11-232-10/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e71a6408867a80f847cd3f7671f6ef009f67a78e' into eclair-mr2-plus-aosp * commit 'e71a6408867a80f847cd3f7671f6ef009f67a78e': Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
| * | | | | | | Merge change I1bceff91 into eclair-mr2Android (Google) Code Review2009-11-232-10/+20
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
| | * | | | | | | Make sure the decoder's input buffers are large enough to hold the largest ↵Andreas Huber2009-11-232-10/+20
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | input data. Verify that the setting actually sticks.
* | | | | | | | am e0030418: am bca9f1bb: sdk doc change for esr: updates for android 1.6 ↵Dirk Dougherty2009-11-2311-53/+159
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r2, tools r4, api levels. Merge commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c' into eclair-mr2-plus-aosp * commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c': sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
| * | | | | | | am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, ↵Dirk Dougherty2009-11-2311-53/+159
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | api levels. Merge commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e' into eclair-mr2 * commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e': sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
| | * | | | | | sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.Dirk Dougherty2009-11-2311-53/+159
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2160782 Change-Id: Ia576dc9b2312d89bbe194d94640c3cc79216067b
* | | | | | | am b2796da2: am 0d631b9b: Merge change Ie7096ebb into eclairEric Olsen2009-11-231-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f' into eclair-mr2-plus-aosp * commit 'b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f': Add logging of headset events to help debug issue.
| * | | | | | am 0d631b9b: Merge change Ie7096ebb into eclairEric Olsen2009-11-231-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0d631b9b58db54bee58da717b38b8020bc3d0437' into eclair-mr2 * commit '0d631b9b58db54bee58da717b38b8020bc3d0437': Add logging of headset events to help debug issue.
| | * | | | | Merge change Ie7096ebb into eclairAndroid (Google) Code Review2009-11-231-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add logging of headset events to help debug issue.
| | | * | | | | Add logging of headset events to help debug issue.Eric Olsen2009-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Olsen <eolsen@android.com>
* | | | | | | | am 4174016d: Merge change I53e3a20e into eclair-mr2Fred Quintana2009-11-232-211/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4174016dbd043eda493e9cd1925ed84549c7b3c0' into eclair-mr2-plus-aosp * commit '4174016dbd043eda493e9cd1925ed84549c7b3c0': move SubscribedFeeds to GSF