Commit Graph

9989 Commits

Author SHA1 Message Date
Jason Chen
9dc2e75e27 Add Deprecated annotation to getPluginsPath/setPluginsPath
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
2010-09-01 19:17:22 -07:00
Hung-ying Tyan
f83d4f1779 resolved conflicts for merge of 3e4975a5 to master
Change-Id: Icd382fc43c8a1975801ab42eb184b633520149c7
2010-09-02 09:56:04 +08:00
Hung-ying Tyan
3e4975a52c am 3424c02e: Add software features for SIP and VOIP
Merge commit '3424c02e6b931a8bbd651ae75217bebd008b2605' into gingerbread-plus-aosp

* commit '3424c02e6b931a8bbd651ae75217bebd008b2605':
  Add software features for SIP and VOIP
2010-09-01 18:01:31 -07:00
Hung-ying Tyan
3424c02e6b Add software features for SIP and VOIP
and block SipService creation and SIP API if the feature is not available.

Change-Id: Icf780af1ac20dda4d8180cea3e5b20e21a8350bc
2010-09-02 08:10:13 +08:00
Dan Morrill
90324669f2 am 61f1cbdd: am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread
Merge commit '61f1cbdd71942433ce1515b614ec3d9c259ea037'

* commit '61f1cbdd71942433ce1515b614ec3d9c259ea037':
  Adding a feature definition corresponding to support for Near-Field
2010-09-01 17:03:33 -07:00
Robert Greenwalt
21e7844967 Merge "Remember mobile nets availability" 2010-09-01 16:20:09 -07:00
Robert Greenwalt
d3afa8f8ff Merge "Fix NPE in toString" 2010-09-01 16:18:01 -07:00
Robert Greenwalt
0dd89664c0 Merge "Add a default dns entry if none is provided" 2010-09-01 16:11:04 -07:00
Romain Guy
2b9a92a80b Merge "Add support for Canvas flags on save." 2010-09-01 15:52:59 -07:00
Romain Guy
8aef54fa17 Add support for Canvas flags on save.
This is required for the rewrite of layers support.

Change-Id: I5c0867dcf5aeb0392c8d0fbab05febb0eaff70d9
2010-09-01 15:49:25 -07:00
Robert Greenwalt
e90aa5e97e Add a default dns entry if none is provided
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
2010-09-01 15:25:51 -07:00
Dan Morrill
61f1cbdd71 am a800a2ef: Merge "Adding a feature definition corresponding to support for 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
2010-09-01 15:05:34 -07:00
Dan Morrill
76437d3793 Adding a feature definition corresponding to support for Near-Field
Communications (NFC).

Change-Id: I32b1b949524bfd978f53e23e02d38dfba4a2ea9c
2010-09-01 14:42:23 -07:00
Robert Greenwalt
cff25ffb0a Remember mobile nets availability
Change-Id: I402ac64bf477b0b600b17f0267c2ff5c19ab9cf3
2010-09-01 14:38:07 -07:00
Adam Powell
6fb81376b6 am e34fe69e: Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread
Merge commit 'e34fe69e66d8c9bc76453347ba84261b060300f3' into gingerbread-plus-aosp

* commit 'e34fe69e66d8c9bc76453347ba84261b060300f3':
  DO NOT MERGE Integrate edge effects into WebView.
2010-09-01 14:01:44 -07:00
Adam Powell
e34fe69e66 Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread 2010-09-01 13:57:05 -07:00
Daisuke Miyakawa
f90132b3fe Merge "Clarify the behavior of ListView#setColorHint()." 2010-09-01 13:50:20 -07:00
Derek Sollenberger
edb3211c85 am 27c6f7d4: am 1614843e: Merge "Fix invalid comment in WebSettings." into gingerbread
Merge commit '27c6f7d44c592ab8685b93a2ec30a74d594c822d'

* commit '27c6f7d44c592ab8685b93a2ec30a74d594c822d':
  Fix invalid comment in WebSettings.
2010-09-01 13:18:40 -07:00
Daisuke Miyakawa
5be37c81a7 Clarify the behavior of ListView#setColorHint().
Bug: 2965521
Change-Id: Iacd139b0e9eec4bfdd007eb1391cc45c1d889b00
2010-09-01 13:09:08 -07:00
Elliott Slaughter
7c2d1353f5 Cleanup temporary incognito mode files after last tab closes.
Change-Id: Iae5df353fdfd36c8eefa273a8812e80309e42841
2010-09-01 12:55:52 -07:00
Brian Carlstrom
c9ad7c6dbb resolved conflicts for merge of 41e99538 to master
Change-Id: Idddb72e369f127cd74322c3c7385701c2412e343
2010-09-01 12:41:36 -07:00
Adam Powell
230269d43b DO NOT MERGE Integrate edge effects into WebView.
TODO Effect for scaling gestures; asset/polish tweaks.

Change-Id: Ifbc201cb64e0610dbc92a7c57ba0d3a4ee686c43
2010-09-01 11:56:56 -07:00
Derek Sollenberger
27c6f7d44c am 1614843e: Merge "Fix invalid comment in WebSettings." into gingerbread
Merge commit '1614843e93d98910147380969d034009ecb23aa2' into gingerbread-plus-aosp

* commit '1614843e93d98910147380969d034009ecb23aa2':
  Fix invalid comment in WebSettings.
2010-09-01 11:32:16 -07:00
Derek Sollenberger
fdbdeb3137 Fix invalid comment in WebSettings.
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
2010-09-01 14:15:50 -04:00
Brian Carlstrom
41e9953863 am 17510863: New Java-based SamplingProfiler
Merge commit '1751086360056bc60d00f2ed2988bc82be9e7bd9' into gingerbread-plus-aosp

* commit '1751086360056bc60d00f2ed2988bc82be9e7bd9':
  New Java-based SamplingProfiler
2010-09-01 10:44:56 -07:00
Brian Carlstrom
1751086360 New Java-based SamplingProfiler
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
2010-09-01 10:17:25 -07:00
Cary Clark
173a86b6d7 Merge "add web setting for enabling/disabling synthetic links" 2010-09-01 10:13:24 -07:00
Robert Greenwalt
f6682b0317 Fix NPE in toString
bug:2965739
Change-Id: Ic3f274cba8ac668d86a8f69f1b2b738d348b3977
2010-09-01 10:09:40 -07:00
Cary Clark
6c43d5231d add web setting for enabling/disabling synthetic links
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
2010-09-01 12:52:13 -04:00
Leon Scroggins
fe026bdd3c Move Find on page and Select ActionModes to framework.
Bug: 2938052

Requires a change to packages/apps/Browser

Change-Id: I1bb1a47610b06c4bb02ef08647c02cc1dcaddb15
2010-09-01 11:48:05 -04:00
Leon Scroggins III
e1ab2228e2 Merge "Send delete key events when pressed at beginning of field." 2010-09-01 08:43:47 -07:00
Derek Sollenberger
c92de67da3 Fix NPE when WebView is being destroyed prior to callback completion.
Change-Id: I964c8b7846e37b554b9bda8cda4f62f3e3851691
http://b/2947192
2010-09-01 09:23:30 -04:00
Derek Sollenberger
0171bfba04 am 73ef5d4e: DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.
Merge commit '73ef5d4e2bcbf28ccb84580439f2f79d5cea1ec7' into gingerbread-plus-aosp

* commit '73ef5d4e2bcbf28ccb84580439f2f79d5cea1ec7':
  DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.
2010-09-01 06:12:16 -07:00
Derek Sollenberger
73ef5d4e2b DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.
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
2010-09-01 09:01:48 -04:00
Kristian Monsen
69697265e0 Merge "Fix warnings in docs generation." 2010-09-01 01:59:15 -07:00
Chung-yih Wang
dbecc24a4e resolved conflicts for merge of a329aef4 to master
Change-Id: I5a64ee2b6adc56a7521d2e55a72e519a284d5a7c
2010-09-01 11:00:33 +08:00
Chung-yih Wang
a329aef43f am 042e9bd9: Add SIP related settings in the Settings.System.
Merge commit '042e9bd989d9c78e23ed29011b6532743f510625' into gingerbread-plus-aosp

* commit '042e9bd989d9c78e23ed29011b6532743f510625':
  Add SIP related settings in the Settings.System.
2010-08-31 19:07:31 -07:00
Dianne Hackborn
2394c164a7 am ec438e14: am 361199b5: Add PackageManager API to get information about a provider component.
Merge commit 'ec438e1448ebc578ee5a4c4beb1e26292cdedd6e'

* commit 'ec438e1448ebc578ee5a4c4beb1e26292cdedd6e':
  Add PackageManager API to get information about a provider component.
2010-08-31 19:06:25 -07:00
Dianne Hackborn
ec438e1448 am 361199b5: Add PackageManager API to get information about a provider component.
Merge commit '361199b5e742c6635d4d7a03de6cf37b31cf442c' into gingerbread-plus-aosp

* commit '361199b5e742c6635d4d7a03de6cf37b31cf442c':
  Add PackageManager API to get information about a provider component.
2010-08-31 19:03:36 -07:00
Chung-yih Wang
042e9bd989 Add SIP related settings in the Settings.System.
Change-Id: I00b6daee42fa59b662a380f832f76e67ca9402bc
2010-09-01 10:02:07 +08:00
Dianne Hackborn
361199b5e7 Add PackageManager API to get information about a provider component.
Kind-of useful when all you have is a ComponentName.

Change-Id: I9a99f12daabb29e97e882e09c43ca0df70c00651
2010-08-31 18:59:04 -07:00
Dmitri Plotnikov
ecd369699c Merge "Adding a parameter to limit the number rows returned" 2010-08-31 17:44:08 -07:00
Dmitri Plotnikov
5a998dd230 Adding a parameter to limit the number rows returned
Useful mostly for search queries

Change-Id: I4dadd2cdb110920c4f21b28d57c56b9d1f2ad4ff
2010-08-31 17:32:16 -07:00
Gilles Debunne
9e0a9d84e6 am ff46a5c9: am d2fbabad: Merge "Fixed single line state on TextView." into gingerbread
Merge commit 'ff46a5c9bd55c492925ffcb608510a0a3dd8a969'

* commit 'ff46a5c9bd55c492925ffcb608510a0a3dd8a969':
  Fixed single line state on TextView.
2010-08-31 16:35:53 -07:00
Gilles Debunne
ff46a5c9bd am d2fbabad: Merge "Fixed single line state on TextView." into gingerbread
Merge commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3' into gingerbread-plus-aosp

* commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3':
  Fixed single line state on TextView.
2010-08-31 16:22:54 -07:00
Gilles Debunne
e67b58a347 Fixed single line state on TextView.
singleLine flag is set to false by default. However, when no singleLine or input
type is provided, the inputType of the TextView is not set to
EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE for edit texts.

Change-Id: Id747d3319afcddb3ab6ae0463947e8b3e470ef73
2010-08-31 16:02:18 -07:00
Andrew Stadler
eb91e78ff9 Merge "Fix crash when proxy exclusion list is null." 2010-08-31 14:38:49 -07:00
Mike Lockwood
f06a449951 Merge "MTP: Send an Intent after an MTP session that resulted in media database modifications" 2010-08-31 14:32:39 -07:00
Andrew Stadler
ac19f24cc1 Fix crash when proxy exclusion list is null.
Also cleaned up source a little bit and eliminated a warning.

Bug: 2964821
Change-Id: I35825bb345742ea1a1854e8998aa67e353deaa17
2010-08-31 14:28:58 -07:00
Mike Lockwood
d20e802512 Merge "Add settings option for running MTP server in PTP mode." 2010-08-31 13:47:13 -07:00