Commit Graph

13888 Commits

Author SHA1 Message Date
Romain Guy
1abe452515 Merge "Add drawing profiling to the HardwareRenderer." 2010-09-23 16:34:05 -07:00
Romain Guy
9a40babc62 Add drawing profiling to the HardwareRenderer.
Change-Id: Idf410f1764f3e73590b587d0d76a8d10c021f056
2010-09-23 16:32:47 -07:00
Romain Guy
d1fbcbb3cc Merge "Don't clip alpha layers if the flag is not set." 2010-09-23 16:18:32 -07:00
Romain Guy
fd880425e0 Don't clip alpha layers if the flag is not set.
Change-Id: I820fa66bc3699357677f37a769de52fd176d9416
2010-09-23 16:16:04 -07:00
Amith Yamasani
b723ff009e Merge "Fix for Ringtones not being saved when using Preference fragments." 2010-09-23 16:07:20 -07:00
Amith Yamasani
82e7bc1134 Fix for Ringtones not being saved when using Preference fragments.
Bug: 2988732

RingtonePreference was calling startActivityForResult on Activity instead
of on Fragment, so the result was not being delivered to the fragment.

Setting a fragment owner on the PreferenceManager instance so that it can
be used instead of getActivity() for launching the intent.

Not exposing any new public APIs at this time.
2010-09-23 15:14:59 -07:00
Jeff Brown
5bd069fe1e am 27917946: am de04fb0a: Merge "Enforce serial ordering of MotionEvents." into gingerbread
Merge commit '279179461edccaa4217fe752a9abf6fcc2efa5a1'

* commit '279179461edccaa4217fe752a9abf6fcc2efa5a1':
  Enforce serial ordering of MotionEvents.
2010-09-23 14:57:14 -07:00
Jeff Brown
279179461e am de04fb0a: Merge "Enforce serial ordering of MotionEvents." into gingerbread
Merge commit 'de04fb0a0366057028369eb3b3efcb75367f74db' into gingerbread-plus-aosp

* commit 'de04fb0a0366057028369eb3b3efcb75367f74db':
  Enforce serial ordering of MotionEvents.
2010-09-23 14:53:52 -07:00
Jeff Brown
de04fb0a03 Merge "Enforce serial ordering of MotionEvents." into gingerbread 2010-09-23 14:51:52 -07:00
Kenny Root
43480d7b4d am 2b1ffce1: am 7f459df9: Merge "Better errors in PackageManagerTests" into gingerbread
Merge commit '2b1ffce18301ae051a70a85254133c29b9381593'

* commit '2b1ffce18301ae051a70a85254133c29b9381593':
  Better errors in PackageManagerTests
2010-09-23 14:34:55 -07:00
Kenny Root
2b1ffce183 am 7f459df9: Merge "Better errors in PackageManagerTests" into gingerbread
Merge commit '7f459df9f94bc52e53d42894dea4702394fbad5c' into gingerbread-plus-aosp

* commit '7f459df9f94bc52e53d42894dea4702394fbad5c':
  Better errors in PackageManagerTests
2010-09-23 14:31:06 -07:00
Kenny Root
7f459df9f9 Merge "Better errors in PackageManagerTests" into gingerbread 2010-09-23 14:27:00 -07:00
Jeff Brown
93ed4e3052 Enforce serial ordering of MotionEvents.
This change modifies ViewRoot to wait until the MotionEvent has been
delivered before telling the input dispatcher that it is finished.
The serial ordering guarantee will be required by new features that
may need to transfer touch focus from one window to another.

Change-Id: I0a64d1f0c8bc3f08846f213d6e28ce48b1d48e58
2010-09-23 13:56:30 -07:00
Eric Fischer
39b41d9280 Merge "Remove translations of date formats not needed since cupcake." 2010-09-23 13:47:53 -07:00
Steve Howard
9c7bec2538 am 1fd11292: am bb0d23b5: Have DownloadManager pass file URIs for legacy external downloads
Merge commit '1fd1129264ef4379633aa4fcd8a9ecaeeb9797f3'

* commit '1fd1129264ef4379633aa4fcd8a9ecaeeb9797f3':
  Have DownloadManager pass file URIs for legacy external downloads
2010-09-23 13:11:19 -07:00
Steve Howard
1c134d5559 am 8449490a: am 4f564cde: Tweaks to download manager API based on API review feedback
Merge commit '8449490a94fb5ab02be2a67d4b57c017d8abd75a'

* commit '8449490a94fb5ab02be2a67d4b57c017d8abd75a':
  Tweaks to download manager API based on API review feedback
2010-09-23 13:10:58 -07:00
Scott Main
35a840c8b1 am a2427797: am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo
Merge commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2'

* commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2':
  docs: add more info about state list drawable and onclick attribute to Button
2010-09-23 13:10:22 -07:00
Steve Howard
1fd1129264 am bb0d23b5: Have DownloadManager pass file URIs for legacy external downloads
Merge commit 'bb0d23b5475cb516fa6f61ee3fe4e7b79cd980f8' into gingerbread-plus-aosp

* commit 'bb0d23b5475cb516fa6f61ee3fe4e7b79cd980f8':
  Have DownloadManager pass file URIs for legacy external downloads
2010-09-23 13:02:21 -07:00
Steve Howard
8449490a94 am 4f564cde: Tweaks to download manager API based on API review feedback
Merge commit '4f564cdeb8478f1a20263fc036c74cc4a63145c3' into gingerbread-plus-aosp

* commit '4f564cdeb8478f1a20263fc036c74cc4a63145c3':
  Tweaks to download manager API based on API review feedback
2010-09-23 12:50:07 -07:00
Steve Howard
bb0d23b547 Have DownloadManager pass file URIs for legacy external downloads
DownloadManager was set up to return file URIs for public API
downloads to external, but to return content URIs for all others.
This included browser downloads, which are on external but don't go
through the public API.  Since the new downloads UI uses
DownloadManager, it was affected by this change when the user opened a
file from the UI.  Apparently numerous things don't handle content
URIs well, including music preview (clicking on downloaded mp3) and
package installer (clicking on downloaded APK), so this change makes
it generate file URIs for legacy external downloads.

Change-Id: I5c34d8ba188cc8b0d11865262cb451208be78eae
2010-09-23 12:45:28 -07:00
Steve Howard
4f564cdeb8 Tweaks to download manager API based on API review feedback
* improved documentation of the default destination on the download
  cache and the concomitant consequences

* removed NETWORK_WIMAX flag for setting allowed networks

* changed request headers behavior to support multiple instances of
  the same header (as allowed in the HTTP spec), renamed
  setRequestHeader() to addRequestHeader()

* accept user-facing strings as CharSequences instead of Strings

* new convenience methods setDestinationInExternalFilesDir() and
  setDestinationInExternalPublicDir() for setting a destination in
  either shared or app-private external storage directories

* renamed setMediaType() to setMimeType()

Change-Id: I8781e2214d939c340209cab917bbbba264ab919c
2010-09-23 12:42:34 -07:00
Amith Yamasani
085002c5ef am 847810f0: am 6e98c280: Merge "Fix for IndexOutOfBounds in setComposingRegion." into gingerbread
Merge commit '847810f0cdccd10e6e233281d4eb984b7ce8d680'

* commit '847810f0cdccd10e6e233281d4eb984b7ce8d680':
  Fix for IndexOutOfBounds in setComposingRegion.
2010-09-23 11:56:40 -07:00
Scott Main
a24277977d am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo
Merge commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95' into gingerbread-plus-aosp

* commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95':
  docs: add more info about state list drawable and onclick attribute to Button
2010-09-23 11:46:10 -07:00
Scott Main
2dc43f3d4c am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo
Merge commit '5b7328f257a76ff6b7b60872d6a106002ff1f679' into gingerbread

* commit '5b7328f257a76ff6b7b60872d6a106002ff1f679':
  docs: add more info about state list drawable and onclick attribute to Button
2010-09-23 11:41:48 -07:00
Amith Yamasani
847810f0cd am 6e98c280: Merge "Fix for IndexOutOfBounds in setComposingRegion." into gingerbread
Merge commit '6e98c280f792932d60bf9374c8979d9eadce2d9c' into gingerbread-plus-aosp

* commit '6e98c280f792932d60bf9374c8979d9eadce2d9c':
  Fix for IndexOutOfBounds in setComposingRegion.
2010-09-23 11:34:11 -07:00
Irfan Sheriff
c6c9a7df58 Merge "Add Wifi Protected Setup support" 2010-09-23 11:33:49 -07:00
Kenny Root
94e0acbf2f Better errors in PackageManagerTests
PackageManagerTests was catching assertion errors and just spitting out
a generic "Hey, there was an error!" message. This eliminates that and
adds some expected outcomes in the assertions.

Change-Id: I27baa3c57c85b0cae4ea76aaf1e2a9b61b2c32b7
2010-09-23 11:11:46 -07:00
Amith Yamasani
6e98c280f7 Merge "Fix for IndexOutOfBounds in setComposingRegion." into gingerbread 2010-09-23 11:03:49 -07:00
Steve Block
9b7ff13bfb Merge changes I4ad02ee1,I1bafc79b,I2c4df95e
* changes:
  Remove deprecated WebRuntime code
  Fix DumpRenderTree2 to clear AppCache between tests
  Fix DumpRenderTree2 to wait for the WebCore thread to become ready
2010-09-23 11:03:00 -07:00
Ben Murdoch
f39b2cfadb Make autofill a webview preference
Change-Id: I2bed0612ad6381dd4c6aedf4af8740fac33748c7
2010-09-23 18:02:15 +01:00
Irfan Sheriff
5ee89800be Add Wifi Protected Setup support
Add WPS PBC and WPS pin method support with pin obtained
from AP

Bug: 2277571

Change-Id: I6ff8e447ab8c5e59456a55152588fd4d6386c610
2010-09-23 09:13:34 -07:00
Kristian Monsen
27a835f8d8 Merge "Fix deadlock in HTTP authentication within synchronous request." 2010-09-23 09:08:32 -07:00
Ben Murdoch
62275a461e Make WebTextView display an "AutoFill this form" option
When the user clicks to AutoFill the form, we propogate a message
to WebCore through WebViewCore to actually perform the action.

Corresponding change in external/webkit needed to implement the
native method that gets called to execute

Change-Id: I6c75ab9b2c5404580de549b69102ab9374493c34
2010-09-23 17:03:51 +01:00
Iain Merrick
4f0e56b7af Fix deadlock in HTTP authentication within synchronous request.
When HTTP authentication results in the user being prompted for a username
and password, this is handled asynchronously in the UI thread. However, we
can't post the result back to the WebKit thread in the normal way because
WebKit does not pump its message queue during synchronous requests.

Instead, we call WebKit directly from the UI thread and let it handle the
threading. This is safe to do because we're using thread-safe STL and
Chrome objects, not WebCore objects.

Change-Id: I79c21510186c2352f842c4ff4311687ec40ba45f
2010-09-23 16:59:18 +01:00
satok
ab751aa085 Add methods for managing subtypes
- added showInputMethodSubtypePicker to public API
-- show the selector dialog for subtypes
- added getter, setter and event handler to InputMethodManagerService
- extract InputMethodSubtype to the top level class for using it in aidl
- TODO: make an enabler for input method subtypes
- TODO: handle the event of changing an input method subtype in LatinIME

Change-Id: I49f8c6675ac4b06511635d14a37bd398738eff33
2010-09-23 16:25:07 +09:00
Wei-Ta Chen
a23cdda0a5 am ac487f70: am 6b849e21: Unhide BitmapRegionDecoder.
Merge commit 'ac487f708f7b58dbd4f3021b520c6ed5975daebe'

* commit 'ac487f708f7b58dbd4f3021b520c6ed5975daebe':
  Unhide BitmapRegionDecoder.
2010-09-22 23:06:55 -07:00
Wei-Ta Chen
ac487f708f am 6b849e21: Unhide BitmapRegionDecoder.
Merge commit '6b849e2123be98eb2a1a25b8abf0b13a279ce952' into gingerbread-plus-aosp

* commit '6b849e2123be98eb2a1a25b8abf0b13a279ce952':
  Unhide BitmapRegionDecoder.
2010-09-22 23:03:30 -07:00
Wei-Ta Chen
6b849e2123 Unhide BitmapRegionDecoder.
1. Rename LargeBitmap to BitmapRegionDecoder
2. Move the instantiations of BitmapRegionDecoder out of BitmapFactory.
3. Remove the use of MemoryFile in BitmapRegionDecoder, since MemoryFile's API had been modified in master. Otherwise, the change will break the master build.
4. Move AssetStreamAdaptor, AutoFDSeek and nullObjectReturn to Utils.h because BitmapFactory.cpp and BitmapRegionDecoder.cpp both need to use these utility functions.

Most of the modifications, except for (2) and (3), were reviewed in https://android-git.corp.google.com/g/#change,64716 .
However, that change broke the master build due to (3) and was reverted eventually.
So, instead of withdrawing this change and waiting for that change to be checked in again, I merge the two changes into one.

Change-Id: I2202c0fbbbd6d6676bbd9637e690023ea4099c40
2010-09-23 13:56:52 +08:00
Adam Powell
37e3f49fb4 am e8189420: Merge "DO NOT MERGE Apply new styles to the status bar/notification shade" into gingerbread
Merge commit 'e81894201979513de87269a21a1802da72d2b954' into gingerbread-plus-aosp

* commit 'e81894201979513de87269a21a1802da72d2b954':
  DO NOT MERGE Apply new styles to the status bar/notification shade
2010-09-22 21:10:41 -07:00
Adam Powell
e818942019 Merge "DO NOT MERGE Apply new styles to the status bar/notification shade" into gingerbread 2010-09-22 21:08:10 -07:00
Adam Powell
e241621e98 DO NOT MERGE Apply new styles to the status bar/notification shade
Change-Id: I5e89891852ff96f113083ac87bcfd74732c43faa
2010-09-22 21:06:37 -07:00
Romain Guy
806de5b1c5 Remove unused constant.
Change-Id: I02e8f76cc1406e693f822822808b3485d2158884
2010-09-22 20:08:33 -07:00
Scott Main
6ec3d4f0dc docs: add more info about state list drawable and onclick attribute to Button
bug:1062898

Change-Id: I633c38fc20a2ebf894237f86648cc0fdc9488b1a
2010-09-22 18:55:31 -07:00
Mike Lockwood
a9158425cc Merge "Changes to support MediaProvider refactoring" 2010-09-22 18:50:06 -07:00
Joe Onorato
5eb22e2ce1 am 19c4b29d: am 8310b42f: Add javadoc saying that wake locks are ref counted by default.
Merge commit '19c4b29d46aece70dbe532ba9078c904fbc62502'

* commit '19c4b29d46aece70dbe532ba9078c904fbc62502':
  Add javadoc saying that wake locks are ref counted by default.
2010-09-22 17:33:54 -07:00
Joe Onorato
19c4b29d46 am 8310b42f: Add javadoc saying that wake locks are ref counted by default.
Merge commit '8310b42fbc086b0f05fc8ef45ac34c7e099c485e' into gingerbread-plus-aosp

* commit '8310b42fbc086b0f05fc8ef45ac34c7e099c485e':
  Add javadoc saying that wake locks are ref counted by default.
2010-09-22 17:29:49 -07:00
John Wang
c188b3d077 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-09-22 17:06:45 -07:00
Dmitri Plotnikov
7b30772ae1 Merge "Adding PHOTO_URI and PHOTO_THUMBNAIL_URI." 2010-09-22 17:05:28 -07:00
Steve Howard
66df755834 am 1d056cd6: am 127146ee: Merge "Decrease sensitivity of orientation changes a bit." into gingerbread
Merge commit '1d056cd6ef6d6bdea00a92f411b0eaec7694b624'

* commit '1d056cd6ef6d6bdea00a92f411b0eaec7694b624':
  Decrease sensitivity of orientation changes a bit.
2010-09-22 17:04:15 -07:00
Amith Yamasani
4198918eed Fix for IndexOutOfBounds in setComposingRegion.
Bug: 3000457

Check upper and lower bounds of the composing region and clip them.

Change-Id: I8128a2b581ce3d8a9ff6c71cc648c3e87163b3f5
2010-09-22 16:58:13 -07:00