summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix 2579224: Add a separate timeout for lockscreen vs display"Jim Miller2010-09-011-0/+8
|\
| * Fix 2579224: Add a separate timeout for lockscreen vs displayJim Miller2010-09-011-0/+8
| | | | | | | | | | | | | | This change adds a second timeout to the SecuritySettings page separate from the standard display timeout. Change-Id: I41fe10e31688308f52695ad3ee30a4b0507112bd
* | am 14d56840: am bc5ec2f9: Merge "Improve messages when java process is ↵Dianne Hackborn2010-09-011-3/+6
|\ \ | |/ |/| | | | | | | | | | | | | starting." into gingerbread Merge commit '14d56840eeec537c037bebaeaebf1b37f48d8dad' * commit '14d56840eeec537c037bebaeaebf1b37f48d8dad': Improve messages when java process is starting.
| * am bc5ec2f9: Merge "Improve messages when java process is starting." into ↵Dianne Hackborn2010-09-011-3/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1' into gingerbread-plus-aosp * commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1': Improve messages when java process is starting.
| | * Merge "Improve messages when java process is starting." into gingerbreadDianne Hackborn2010-09-011-3/+6
| | |\
| | | * Improve messages when java process is starting.Dianne Hackborn2010-09-011-3/+6
| | | | | | | | | | | | | | | | Change-Id: I33e401eb240a454845987c10d44e3520e419721b
| * | | am b766ab83: DO NOT MERGE Add deprecated annotation to get/set PluginsPath ↵Jason Chen2010-09-011-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | and update current.xml Merge commit 'b766ab830a714c0b79f64265e681f454865ffe65' into gingerbread-plus-aosp * commit 'b766ab830a714c0b79f64265e681f454865ffe65': DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
| | * | DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update ↵Jason Chen2010-09-011-0/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | current.xml Previous changes only added javadoc annotation, but didn't apply annotation to the source. Fixing this and updating current.xml. Change-Id: I52aabd6485a3972fc360f24c2e86cc342a5101ab
* | | Add Deprecated annotation to getPluginsPath/setPluginsPathJason Chen2010-09-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Javadoc annotations aren't enough to properly mark an API as deprecated. This change adds the @Deprecated annotation to the source and updates current.xml. Change-Id: I04a398fc04ad99979c674789af5af994fbd25be0
* | | resolved conflicts for merge of 3e4975a5 to masterHung-ying Tyan2010-09-021-1/+15
|\ \ \ | |/ / | | | | | | Change-Id: Icd382fc43c8a1975801ab42eb184b633520149c7
| * | am 3424c02e: Add software features for SIP and VOIPHung-ying Tyan2010-09-011-1/+15
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '3424c02e6b931a8bbd651ae75217bebd008b2605' into gingerbread-plus-aosp * commit '3424c02e6b931a8bbd651ae75217bebd008b2605': Add software features for SIP and VOIP
| | * Add software features for SIP and VOIPHung-ying Tyan2010-09-021-1/+15
| | | | | | | | | | | | | | | | | | and block SipService creation and SIP API if the feature is not available. Change-Id: Icf780af1ac20dda4d8180cea3e5b20e21a8350bc
* | | am 61f1cbdd: am a800a2ef: Merge "Adding a feature definition corresponding ↵Dan Morrill2010-09-011-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | to support for Near-Field Communications (NFC)." into gingerbread Merge commit '61f1cbdd71942433ce1515b614ec3d9c259ea037' * commit '61f1cbdd71942433ce1515b614ec3d9c259ea037': Adding a feature definition corresponding to support for Near-Field
| * | am a800a2ef: Merge "Adding a feature definition corresponding to support for ↵Dan Morrill2010-09-011-0/+8
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | Near-Field Communications (NFC)." into gingerbread Merge commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b' into gingerbread-plus-aosp * commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b': Adding a feature definition corresponding to support for Near-Field
| | * Adding a feature definition corresponding to support for Near-FieldDan Morrill2010-09-011-0/+8
| | | | | | | | | | | | | | | | | | Communications (NFC). Change-Id: I32b1b949524bfd978f53e23e02d38dfba4a2ea9c
| * | am e34fe69e: Merge "DO NOT MERGE Integrate edge effects into WebView." into ↵Adam Powell2010-09-013-29/+203
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'e34fe69e66d8c9bc76453347ba84261b060300f3' into gingerbread-plus-aosp * commit 'e34fe69e66d8c9bc76453347ba84261b060300f3': DO NOT MERGE Integrate edge effects into WebView.
| | * Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbreadAdam Powell2010-09-013-29/+203
| | |\
| | | * DO NOT MERGE Integrate edge effects into WebView.Adam Powell2010-09-013-29/+203
| | | | | | | | | | | | | | | | | | | | | | | | TODO Effect for scaling gestures; asset/polish tweaks. Change-Id: Ifbc201cb64e0610dbc92a7c57ba0d3a4ee686c43
| * | | am b1387127: Merge "Fix build (restore deleted assets)." into gingerbreadDaniel Sandler2010-09-012-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'b1387127f18b73d7f1038dad6e432329b78264ae' into gingerbread-plus-aosp * commit 'b1387127f18b73d7f1038dad6e432329b78264ae': Fix build (restore deleted assets).
| | * | Merge "Fix build (restore deleted assets)." into gingerbreadDaniel Sandler2010-09-012-0/+0
| | |\ \
| | | * | Fix build (restore deleted assets).Daniel Sandler2010-09-012-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I89362191131e2e8e3d276ab8444edd0d5041211c
* | | | | Merge "Remember mobile nets availability"Robert Greenwalt2010-09-011-22/+3
|\ \ \ \ \
| * | | | | Remember mobile nets availabilityRobert Greenwalt2010-09-011-22/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I402ac64bf477b0b600b17f0267c2ff5c19ab9cf3
* | | | | | Merge "Fix NPE in toString"Robert Greenwalt2010-09-011-2/+6
|\ \ \ \ \ \
| * | | | | | Fix NPE in toStringRobert Greenwalt2010-09-011-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:2965739 Change-Id: Ic3f274cba8ac668d86a8f69f1b2b738d348b3977
* | | | | | | Merge "Add a default dns entry if none is provided"Robert Greenwalt2010-09-012-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Add a default dns entry if none is providedRobert Greenwalt2010-09-012-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes part of emulator which isn't telling us about dns servers. Gets some stuff running, but browser is still broken. bug:2961703 Change-Id: I53b946eba434aca1bb524c2acaf77922377948d1
* | | | | | | | Merge "Add support for Canvas flags on save."Romain Guy2010-09-011-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add support for Canvas flags on save.Romain Guy2010-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required for the rewrite of layers support. Change-Id: I5c0867dcf5aeb0392c8d0fbab05febb0eaff70d9
* | | | | | | | Merge "Clarify the behavior of ListView#setColorHint()."Daisuke Miyakawa2010-09-011-3/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Clarify the behavior of ListView#setColorHint().Daisuke Miyakawa2010-09-011-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2965521 Change-Id: Iacd139b0e9eec4bfdd007eb1391cc45c1d889b00
* | | | | | | | | am 27c6f7d4: am 1614843e: Merge "Fix invalid comment in WebSettings." into ↵Derek Sollenberger2010-09-011-2/+10
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '27c6f7d44c592ab8685b93a2ec30a74d594c822d' * commit '27c6f7d44c592ab8685b93a2ec30a74d594c822d': Fix invalid comment in WebSettings.
| * | | | | | | | am 1614843e: Merge "Fix invalid comment in WebSettings." into gingerbreadDerek Sollenberger2010-09-011-2/+10
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1614843e93d98910147380969d034009ecb23aa2' into gingerbread-plus-aosp * commit '1614843e93d98910147380969d034009ecb23aa2': Fix invalid comment in WebSettings.
| | * | | | | | | Merge "Fix invalid comment in WebSettings." into gingerbreadDerek Sollenberger2010-09-011-2/+10
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | Fix invalid comment in WebSettings.Derek Sollenberger2010-09-011-2/+10
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The get/set for the pluginPath is leftover from the Gear's plugin and is no longer useful now that plugins are loaded from their own APK using the package manager. These methods were modified to be no-ops in froyo, but the documentation was never completed. Change-Id: I20f6593445d877a3dae9b9f51d5198a3509255d6 http://b/2811032
| * | | | | | | am 8f8fcfa3: Notifications are now light-on-dark in the windowshade.Daniel Sandler2010-09-017-3/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8f8fcfa319e0e0af14aa8f8555be58555703af02' into gingerbread-plus-aosp * commit '8f8fcfa319e0e0af14aa8f8555be58555703af02': Notifications are now light-on-dark in the windowshade.
| | * | | | | | Notifications are now light-on-dark in the windowshade.Daniel Sandler2010-09-017-3/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Finally. This also fixes that little 1px gap that would occasionally show through to the carbon fiber background (changed to steel cord for now) between the last notification and the windowshade's handlebar. It still gaps a little while you're dragging, due to the asynchronous motion of the various windows involved, but when the panel is still you shouldn't see any background. (Man, that drove me crazy.) Bug: 2949229 Change-Id: If085f4ab7dfb7c3868c30469661907d5d63f070b
* | | | | | | Cleanup temporary incognito mode files after last tab closes.Elliott Slaughter2010-09-011-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iae5df353fdfd36c8eefa273a8812e80309e42841
* | | | | | | resolved conflicts for merge of 41e99538 to masterBrian Carlstrom2010-09-013-38/+47
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: Idddb72e369f127cd74322c3c7385701c2412e343
| * | | | | | am 17510863: New Java-based SamplingProfilerBrian Carlstrom2010-09-013-43/+51
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1751086360056bc60d00f2ed2988bc82be9e7bd9' into gingerbread-plus-aosp * commit '1751086360056bc60d00f2ed2988bc82be9e7bd9': New Java-based SamplingProfiler
| | * | | | | New Java-based SamplingProfilerBrian Carlstrom2010-09-013-43/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary: - libcore: new Java based SamplingProfiler - dalvik: remove old SamplingProfiler native bits - frameworks/base: New placeholder SamplingProfilerIntegration - vendor/google: remove old profiler snapshot parsing code Details: libcore A new 100% Java SamplingProfiler. While it has more overhead that the old native one, the new one can actually collect more than the current PC and frame pointer, so you can get useful context of where your app is spending time. It currently provides ASCII hprof format output for use with tools like PerfAnal dalvik/src/main/java/dalvik/system/SamplingProfiler.java Unit test for the new SamplingProfiler dalvik/src/test/java/dalvik/system/SamplingProfilerTest.java Add core-tests-dalvik JavaLibrary.mk dalvik Removing native code that supported the old SamplingProfiler vm/Dvm.mk vm/native/InternalNative.c vm/native/dalvik_system_SamplingProfiler.c frameworks/base Placeholder SamplingProfilerIntegration. Later plans include generating EventStackTrace protobufs. New SamplingProfiler does not have a global instance, so SamplingProfilerIntegration provides one in INSTANCE. Old binary snapshot format is temporily replaced with ASCII hprof data. core/java/com/android/internal/os/SamplingProfilerIntegration.java Simplified interface for zygote profile snapshotting core/java/com/android/internal/os/ZygoteInit.java Current SamplingProfilerIntegration does not track event loop explicitly, but hprof information does include thread information. core/java/android/app/ActivityThread.java vendor/google Removing code for parsing old SamplingProfiler snapshot format tools/samplingprofiler/Android.mk tools/samplingprofiler/NOTICE tools/samplingprofiler/profiler.iml tools/samplingprofiler/profiler.ipr tools/samplingprofiler/pull-snapshots.sh tools/samplingprofiler/sorttable.js tools/samplingprofiler/src/com/android/profiler/PrintHtml.java
| * | | | | | am 73ef5d4e: DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.Derek Sollenberger2010-09-012-3/+23
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '73ef5d4e2bcbf28ccb84580439f2f79d5cea1ec7' into gingerbread-plus-aosp * commit '73ef5d4e2bcbf28ccb84580439f2f79d5cea1ec7': DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.
| | * | | | | DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.Derek Sollenberger2010-09-012-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support complex characters in plugins. Complex characters like chinese are sent via the onKeyMultiple() callback. The WebView passes these characters to Webkit so that non-text inputs (e.g. plugins) can process them. Change-Id: I49575bb8a583f9f3580f5734ad87cc7c00b2bda9 http://b/2900114
* | | | | | | Merge "add web setting for enabling/disabling synthetic links"Cary Clark2010-09-011-0/+8
|\ \ \ \ \ \ \
| * | | | | | | add web setting for enabling/disabling synthetic linksCary Clark2010-09-011-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to this feature request http://b/1865484 Some webviews wish to load pages and ignore the email, phone, and postal addresses. Add a way to specify that preference to the WebView class. Change-Id: I6c077c6704e821206a8d653cce4036cecfba2e54
* | | | | | | | Move Find on page and Select ActionModes to framework.Leon Scroggins2010-09-0115-62/+519
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2938052 Requires a change to packages/apps/Browser Change-Id: I1bb1a47610b06c4bb02ef08647c02cc1dcaddb15
* | | | | | | Merge "Send delete key events when pressed at beginning of field."Leon Scroggins III2010-09-011-6/+7
|\ \ \ \ \ \ \
| * | | | | | | Send delete key events when pressed at beginning of field.Leon Scroggins III2010-08-271-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2952504 Change-Id: Iafb33a29a3b9e51c5db16e7a123fe91f73480643
* | | | | | | | Fix NPE when WebView is being destroyed prior to callback completion.Derek Sollenberger2010-09-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I964c8b7846e37b554b9bda8cda4f62f3e3851691 http://b/2947192
* | | | | | | | Merge "Fix warnings in docs generation."Kristian Monsen2010-09-013-4/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
generated by cgit v1.1 at 2025-03-25 07:48:24 +0000