summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* am 2464acc6: moved the gdata library to vendor/googleFred Quintana2009-11-247-1429/+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-247-1429/+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 change I1691f3d3 into eclairAndroid (Google) Code Review2009-11-231-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * changes: Add CPUFREQ_STATS event tag DO NOT MERGE
| | | * | Add CPUFREQ_STATS event tagDan Egnor2009-11-211-0/+1
| | | | | | | | | | | | | | | | | | | | DO NOT MERGE
* | | | | 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 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:
| * | | | 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 4174016d: Merge change I53e3a20e into eclair-mr2Fred Quintana2009-11-231-209/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4174016dbd043eda493e9cd1925ed84549c7b3c0' into eclair-mr2-plus-aosp * commit '4174016dbd043eda493e9cd1925ed84549c7b3c0': move SubscribedFeeds to GSF
| * | | | Merge change I53e3a20e into eclair-mr2Android (Google) Code Review2009-11-231-209/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: move SubscribedFeeds to GSF
| | * | | | move SubscribedFeeds to GSFFred Quintana2009-11-231-209/+0
| | | | | |
* | | | | | am e5683369: Merge change I60dfecdc into eclair-mr2Mike Lockwood2009-11-232-2/+40
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a' into eclair-mr2-plus-aosp * commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a': Add window manager support for overriding button and keyboard backlight values.
| * | | | | Merge change I60dfecdc into eclair-mr2Android (Google) Code Review2009-11-232-2/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add window manager support for overriding button and keyboard backlight values.
| | * | | | | Add window manager support for overriding button and keyboard backlight values.Mike Lockwood2009-11-232-2/+40
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new backlightBrightness field works similarly as the existing WindowManager.LayoutParams.screenBrightness field Needed for bugs: b/2233655 (under low ambient light the touch keys remain illuminated during video playback and never timeout) b/2221079 (Backlight for home/search/back/etc buttons should turn off when in dock in night mode) Change-Id: I60dfecdc7bb653b0db38094464de651220b3d438
* | | | | | am ed1624d8: Merge change I8ae1b41a into eclair-mr2Grace Kloba2009-11-231-12/+32
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b' into eclair-mr2-plus-aosp * commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b': Expose some debugging tools of the WebView.
| * | | | | Merge change I8ae1b41a into eclair-mr2Android (Google) Code Review2009-11-231-12/+32
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * changes: Expose some debugging tools of the WebView.
| | * | | | Expose some debugging tools of the WebView.Grace Kloba2009-11-231-12/+32
| | | | | |
* | | | | | am 40c1dbf0: am a59a01ab: Merge change I43f72dd1 into eclairDaniel Sandler2009-11-231-2/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '40c1dbf081035f878b96dd67ef112eb49001c087' into eclair-mr2-plus-aosp * commit '40c1dbf081035f878b96dd67ef112eb49001c087': Don't block TIME_TICK broadcasts in the DigitalClock widget.
| * | | | | am a59a01ab: Merge change I43f72dd1 into eclairDaniel Sandler2009-11-231-2/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a59a01ab2b959a8a5aeb09dd664d5be193fd8219' into eclair-mr2 * commit 'a59a01ab2b959a8a5aeb09dd664d5be193fd8219': Don't block TIME_TICK broadcasts in the DigitalClock widget.
| | * | | | Merge change I43f72dd1 into eclairAndroid (Google) Code Review2009-11-231-2/+7
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Don't block TIME_TICK broadcasts in the DigitalClock widget.
| | | * | | | Don't block TIME_TICK broadcasts in the DigitalClock widget.Daniel Sandler2009-11-201-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change applies the fix -- originally by phanna in https://android-git.corp.google.com/g/#change,33669 -- to the com.android.internal.widget version of DigitalClock, which is used by the keyguard and pattern lock screens. Change-Id: I43f72dd144423e55f73ba52903d52163c8f65591
* | | | | | | am 8631e554: am ad431ad8: Merge change Ia3acc2ee into eclairJaikumar Ganesh2009-11-223-7/+11
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8631e55425b2ab81eb74396e6834c6f7a4549804' into eclair-mr2-plus-aosp * commit '8631e55425b2ab81eb74396e6834c6f7a4549804': Fix pairings lost on reboot.
| * | | | | | am ad431ad8: Merge change Ia3acc2ee into eclairJaikumar Ganesh2009-11-223-7/+11
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-mr2 * commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60': Fix pairings lost on reboot.
| | * | | | | Merge change Ia3acc2ee into eclairAndroid (Google) Code Review2009-11-223-7/+11
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * changes: Fix pairings lost on reboot.
| | | * | | | Fix pairings lost on reboot.Jaikumar Ganesh2009-11-203-7/+11
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bug:2277376 Dr No:Eastham
* | | | | | am dbf3d3ac: am af1f42be: Fix issue #2271668: Live Wallpaper Force-Close ↵Dianne Hackborn2009-11-201-2/+28
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when changing from live wallpaper to picasa wallpaper Merge commit 'dbf3d3acc18f86a671096f1626d80d055bc36e11' into eclair-mr2-plus-aosp * commit 'dbf3d3acc18f86a671096f1626d80d055bc36e11': Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
| * | | | | am af1f42be: Fix issue #2271668: Live Wallpaper Force-Close when changing ↵Dianne Hackborn2009-11-201-2/+28
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from live wallpaper to picasa wallpaper Merge commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d' into eclair-mr2 * commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d': Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
| | * | | | Fix issue #2271668: Live Wallpaper Force-Close when changing from live ↵Dianne Hackborn2009-11-201-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wallpaper to picasa wallpaper The detach of the wallpaper engine was coming in after the containing service was destroyed. This was possible because these are different IPC interfaces so will not be serialized. The fix is to keep track of all of the active engines in the serice, and detach any remaining ones when the service is destroyed. Change-Id: I8810786a777dd4f7b15cfbd2e0da25866a4f3ec5
* | | | | | am f2900600: am 1824ec8c: Merge change If2b0bbed into eclairDianne Hackborn2009-11-201-5/+22
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f29006000cfbcf7732df5d5432ab5ff8a2dbf691' into eclair-mr2-plus-aosp * commit 'f29006000cfbcf7732df5d5432ab5ff8a2dbf691': Debugging for issue #2228381 android.view.InflateException
| * | | | | am 1824ec8c: Merge change If2b0bbed into eclairDianne Hackborn2009-11-201-5/+22
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1824ec8c127e3a8ef602d027e3c10d81f28320e8' into eclair-mr2 * commit '1824ec8c127e3a8ef602d027e3c10d81f28320e8': Debugging for issue #2228381 android.view.InflateException
| | * | | | Debugging for issue #2228381 android.view.InflateExceptionDianne Hackborn2009-11-201-5/+22
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binary XML file line #37: Error inflating class <unknown> after adding a secondary account Now that I have these debug logs, I want to keep them since they will make debugging these kinds of issues a lot easier in the future. (Note in this case there was no problem in the framework.) Change-Id: If2b0bbeda4706b7c5dc1ba4a5db04b74f40e1543
* | | | | am f8c2bb36: Add gservices flags for calendar sync.Ken Shirriff2009-11-201-0/+38
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f8c2bb36f7b5d49553155559bc30c4e9211340e4' into eclair-mr2-plus-aosp * commit 'f8c2bb36f7b5d49553155559bc30c4e9211340e4': Add gservices flags for calendar sync.
| * | | | Add gservices flags for calendar sync.Ken Shirriff2009-11-201-0/+38
| | | | |
* | | | | am 5a03f36e: maintain cache of statementids returned by sqlite upon ↵Vasu Nori2009-11-2010-140/+480
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compiling a sql stmnt Merge commit '5a03f36ef845f73eb4473193dbb0f93dd12a51af' into eclair-mr2-plus-aosp * commit '5a03f36ef845f73eb4473193dbb0f93dd12a51af': maintain cache of statementids returned by sqlite upon compiling a sql stmnt
| * | | | maintain cache of statementids returned by sqlite upon compiling a sql stmntVasu Nori2009-11-2010-140/+480
| | | | |
* | | | | am cb596642: am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth ↵Scott Main2009-11-203-6/+32
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explainin that discovery should be cancelled before connecting to a device Merge commit 'cb5966426a51aeb7d02e7f859512d20e084e03ed' into eclair-mr2-plus-aosp * commit 'cb5966426a51aeb7d02e7f859512d20e084e03ed': docs for ESR: add docs to bluetooth explainin that discovery should
| * | | | am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that ↵Scott Main2009-11-203-6/+32
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | discovery should be cancelled before connecting to a device Merge commit 'e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-mr2 * commit 'e16113998bb10f39ee1384bfc497aceeeb193440': docs for ESR: add docs to bluetooth explainin that discovery should
| | * | | am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery ↵Scott Main2009-11-203-6/+32
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | should be cancelled before connecting to a device Merge commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair * commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc': docs for ESR: add docs to bluetooth explainin that discovery should
| | | * | | docs for ESR: add docs to bluetooth explainin that discovery shouldScott Main2009-11-193-6/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be cancelled before connecting to a device bug: 2160782,2198463
* | | | | | am 401a712e: IPowerManager: remove some unused methods.Mike Lockwood2009-11-202-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '401a712e3b3b41c77e79a130d7b07d653e18bcab' into eclair-mr2-plus-aosp * commit '401a712e3b3b41c77e79a130d7b07d653e18bcab': IPowerManager: remove some unused methods.
| * | | | | IPowerManager: remove some unused methods.Mike Lockwood2009-11-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7c7fa7eaf6c99e723da20939c27fbc172ad51613 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | am 7caaeecc: Rename WebChromeClient.addMessageToConsole to ↵Ben Murdoch2009-11-202-4/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebChromeClient.onConsoleMessage. Merge commit '7caaeecce1b04e2098dd4f471fdd69ebe28c31b0' into eclair-mr2-plus-aosp * commit '7caaeecce1b04e2098dd4f471fdd69ebe28c31b0': Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
| * | | | | Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.Ben Murdoch2009-11-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=b/2271636 Change-Id: Ia9bed430c624c4c3745904c98fb2e27632d929f9
* | | | | | am 5e332efd: Merge change I903ce7b1 into eclair-mr2Daisuke Miyakawa2009-11-193-59/+98
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7' into eclair-mr2-plus-aosp * commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7': Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
| * | | | | Fix a problem in which Android custom fields are not emitted correctly in ↵Daisuke Miyakawa2009-11-203-59/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-Ascii languages. Internal issue number: 2195990
* | | | | | am 6fd4e76c: fix bad link in javadoc that\'s breaking SDK buildDoug Zongker2009-11-191-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08' into eclair-mr2-plus-aosp * commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08': fix bad link in javadoc that's breaking SDK build