17866 Commits

Author SHA1 Message Date
Bjorn Bringert
8d7f71dfd0 Copy ic_menu_search.png to ic_search_category_default.png
For some reason both these icons are exposed. Some apps use
ic_search_category_default.png for their search menu item,
and some use ic_menu_search.png. To make them look the same,
I copied ic_menu_search to ic_search_category_default.

Fixes http://b/issue?id=2373762

Change-Id: I045efaac84ed9507c4c0c9d6996f1bedb50d753f
2010-02-03 15:25:37 +00:00
Ben Murdoch
ecbfb2104f Revert "am 3db1ebaf: am 4ed2b1c3: Pass touch event time from Java to WebKit". The corresponding change to external/webkit creates a merge conflict in master.
Revert the frameworks/base part of the change so we can "do not merge" the external/webkit change and get the build working again. We can then later resolve
the conflict in external/webkit in master directly.

This reverts commit 9ecd9437ed57bedfa2a7626430be03f4924f6b42, reversing
changes made to 019fe73ddbf52edd1819e1d85a0b242ebccc7fc3.

Change-Id: Id1404fb056b033ebd60529dd326ec9a3c32f94b0
2010-02-03 11:00:00 +00:00
Grace Kloba
9ecd9437ed am 3db1ebaf: am 4ed2b1c3: Pass touch event time from Java to WebKit
Merge commit '3db1ebaf1cc2a097845f217626e31d69e156b73d'

* commit '3db1ebaf1cc2a097845f217626e31d69e156b73d':
  Pass touch event time from Java to WebKit
2010-02-02 23:23:40 -08:00
Jack Palevich
019fe73ddb Fix ETC1 texture decoding.
etc1_decode_image requires the stride argument to be in bytes, but the
surface->stride field is in pixels. Convert by multiplying by pixel size.
2010-02-02 22:50:39 -08:00
Grace Kloba
3db1ebaf1c am 4ed2b1c3: Pass touch event time from Java to WebKit
Merge commit '4ed2b1c34b2dd0e2bd2f403a6f3de0bdbf473b98' into eclair-mr2-plus-aosp

* commit '4ed2b1c34b2dd0e2bd2f403a6f3de0bdbf473b98':
  Pass touch event time from Java to WebKit
2010-02-02 21:07:05 -08:00
Mathias Agopian
b0f324d4a9 Merge "implement [2396050] Add ETC1 texture support to AGL" 2010-02-02 20:34:15 -08:00
Mathias Agopian
d1f73a2fca implement [2396050] Add ETC1 texture support to AGL 2010-02-02 20:19:54 -08:00
Ray Chen
355ca575a9 Add GPS_TIMESTAMP and GPS_DATESTAMP tag to ExifInterface. 2010-02-03 11:34:29 +08:00
Grace Kloba
4ed2b1c34b Pass touch event time from Java to WebKit 2010-02-02 19:08:41 -08:00
Ray Chen
3a8cab88e7 Add GpsDateTime support to ExifInterface and correct images table's date_taken value to UTC timestamp.
http://b/2376777
2010-02-02 18:59:03 -08:00
Xavier Ducrohet
7099bc1010 Merge "Fix the SDK build." 2010-02-02 18:25:38 -08:00
Adam Powell
216bccf804 Updated GestureDetector to ignore multitouch if requested by the app
or if targetSdkVersion >= Froyo. Made ScaleGestureDetector
public. current.xml API updates for gestures.
2010-02-02 17:52:29 -08:00
Xavier Ducrohet
31644a15e8 Fix the SDK build.
Proper link format is <package>.className#methodName(). Not
sure why this worked before.

Change-Id: I23f7f73b735dde47aa2fdc5a0198a16e379ad741
2010-02-02 17:31:34 -08:00
Neal Nguyen
8c18d89f28 Merge "Modifying Services Tests XML file so it builds with the right permissions." 2010-02-02 17:24:49 -08:00
Neal Nguyen
3433d3c90e Modifying Services Tests XML file so it builds with the right permissions. 2010-02-02 17:09:00 -08:00
Mike LeBeau
9c738b97f1 Merge "Improve some of the documentation in RecognizerIntent to reduce confusion." 2010-02-02 17:08:05 -08:00
Mike LeBeau
5a346d631f Improve some of the documentation in RecognizerIntent to reduce confusion.
Specifically point out that startActivity() is not supported for
ACTION_RECOGNIZE_SPEECH, and make the documentation on EXTRA_RESULTS more
clear to point out that this is a part of the results, not the request.
2010-02-02 17:07:22 -08:00
Jason Sams
57405b93f1 Merge "Hide field packer." 2010-02-02 15:46:50 -08:00
Jason Sams
42d6c9e1e7 Hide field packer. 2010-02-02 15:45:58 -08:00
Ficus Kirkpatrick
b66802b3b5 Merge "Fix mms-common's pathnames to match package spec." 2010-02-02 15:43:53 -08:00
Ficus Kirkpatrick
1f4af4ca96 Fix mms-common's pathnames to match package spec.
Change-Id: I4ae65227ea29dff8a79bd1d9373dec46c4b53598
2010-02-02 15:32:55 -08:00
Mike LeBeau
c30ed1a981 Merge "Add "inline" constant to RecognizerResultsIntent." 2010-02-02 15:30:57 -08:00
Jason Sams
2a594b1a24 Merge "Implement holders for Matrix and Vector data." 2010-02-02 15:28:03 -08:00
Chris Tate
37b2217600 Merge "Get rid of now-superfluous "backup or restore in progress" tracking" 2010-02-02 15:27:55 -08:00
Mike LeBeau
dcfefb5db3 Add "inline" constant to RecognizerResultsIntent. 2010-02-02 15:27:43 -08:00
Jason Sams
25430d0734 Implement holders for Matrix and Vector data. 2010-02-02 15:26:40 -08:00
Christopher Tate
c2af5d3bf8 Get rid of now-superfluous "backup or restore in progress" tracking
Now that backup/restore/etc operations are queued and serialized, we no longer
need to use external state tracking to prevent overlapping operations.

Change-Id: I14f2a5d740cb97ae062aad55a06f49a2be5dd985
2010-02-02 15:24:39 -08:00
Andreas Huber
9763f64925 Workaround for misbehaving HTTP servers that terminate header lines with a single newline instead of the required CRLF sequence.
related-to-bug: 2414022
2010-02-02 14:43:08 -08:00
Andreas Huber
23a6b4425f Merge "Don't use a HEAD request to determine redirects, instead do a regular GET (since that's always supported), also limit the number of redirects to avoid infinite redirects. Finally, properly handle the end of stream." 2010-02-02 14:41:41 -08:00
Andreas Huber
b777bf3100 Don't use a HEAD request to determine redirects, instead do a regular GET (since that's always supported), also limit the number of redirects to avoid infinite redirects. Finally, properly handle the end of stream.
related-to-bug: 2403674
2010-02-02 13:54:57 -08:00
San Mehat
a55272afb1 Merge "StorageManager: API_CHANGE: Move StorageManager into android.storage" 2010-02-02 13:31:16 -08:00
Andreas Huber
e124aef7ae Merge "Properly report the duration of a recording into .mp4 files." 2010-02-02 13:01:07 -08:00
San Mehat
556d350a4d StorageManager: API_CHANGE: Move StorageManager into android.storage
Signed-off-by: San Mehat <san@google.com>
2010-02-02 12:56:45 -08:00
Oscar Montemayor
9ec33186c9 Merge "Apps on SD project. Javadoc fixes for new method in PackageManager class." 2010-02-02 12:15:26 -08:00
Andreas Huber
716582e9da Properly report the duration of a recording into .mp4 files.
related-to-bug: 2295468
2010-02-02 12:13:30 -08:00
Grace Kloba
0c08a2440f Merge "Now mSupportMultiTouch is depending on WebSettings, it can't be static any more." 2010-02-02 11:59:38 -08:00
Andreas Huber
2d65817f17 Merge "Properly advertise the content length of the HTTP stream if available." 2010-02-02 11:38:19 -08:00
Grace Kloba
f3be166946 Now mSupportMultiTouch is depending on WebSettings,
it can't be static any more.

Fix http://b/issue?id=2413364
2010-02-02 11:27:41 -08:00
San Mehat
c9d8175f40 Context: API_CHANGE: Add support for retrieving StorageManager
Signed-off-by: San Mehat <san@google.com>
2010-02-02 11:17:47 -08:00
San Mehat
63d15ee6ae DefaultContainerService: Refactor MountService calls (new api)
Signed-off-by: San Mehat <san@google.com>
2010-02-02 11:17:47 -08:00
San Mehat
be16cb15b3 PackageManagerService: Refactor MountService calls (new api)
Signed-off-by: San Mehat <san@google.com>
2010-02-02 11:17:46 -08:00
San Mehat
ec7f7e6378 UsbStorageActivity: Refactor for new MountService API
Signed-off-by: San Mehat <san@google.com>
2010-02-02 11:17:46 -08:00
San Mehat
b339ac3d3e sdutil: Refactor for new APIs
Signed-off-by: San Mehat <san@google.com>
2010-02-02 11:17:46 -08:00
San Mehat
4270e1ea74 MountService: Massive bloat reduction and rewrite
- Most API calls now return an int as a result code (see MountServiceResultCode.java)
- All notification code has been removed
- All settings code has been removed
- Removed UMS centric API calls in favor of more generic 'shares'
- Mount error reporting is no longer done via an event, but is done as part of the
  actual mount process
- Rework vold IPC commands to be more sane

Updated:
    MountService: Rename MountServiceObserver -> MountServiceListener
    MountService: Add support for Async callbacks

Updated:
    MountService: Add BinderDeath handling

Updated:
    MountService: Remove notifys since we dont listen anyways

Updated:
    MountService: Fix bad cast

Signed-off-by: San Mehat <san@google.com>
2010-02-02 11:17:46 -08:00
San Mehat
78071b7347 Merge "NativeDaemonConnector: Cleanup socket code and use a proper exception Signed-off-by: San Mehat <san@google.com>" 2010-02-02 11:15:55 -08:00
San Mehat
476387613b Merge "StorageManager: Introduce StorageManager" 2010-02-02 11:11:06 -08:00
Andreas Huber
8cc1b2a32c Properly advertise the content length of the HTTP stream if available.
related-to-bug: 2312941
2010-02-02 10:38:40 -08:00
Grace Kloba
2df9a91ff5 Hide the android.webkit.CallbackProxy class from the API. This is a android.webkit package class and internal to our implementation.
Although not strictly a published API (the class does not appear in the docs), it has found it's way into the API through
the public, subclassable android.webkit.JsResult class where it is a protected member.

Based on changed from Ben.
2010-02-02 10:30:23 -08:00
Andrei Popescu
3565456ca7 Merge "Make sure application cache manifest files are not cached." 2010-02-02 10:21:51 -08:00
Andrei Popescu
a1ba11bd78 Make sure application cache manifest files are not cached.
Fix b:2326937
2010-02-02 18:10:35 +00:00