drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,865 Commits 1 Branch 0 Tags
Commit Graph

6887 Commits

Author SHA1 Message Date
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
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
Grace Kloba
4ed2b1c34b Pass touch event time from Java to WebKit 2010-02-02 19:08:41 -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
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
Mike LeBeau
c30ed1a981 Merge "Add "inline" constant to RecognizerResultsIntent." 2010-02-02 15:30:57 -08:00
Mike LeBeau
dcfefb5db3 Add "inline" constant to RecognizerResultsIntent. 2010-02-02 15:27:43 -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
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
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
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
476387613b Merge "StorageManager: Introduce StorageManager" 2010-02-02 11:11:06 -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
Patrick Scott
c209ccf460 Merge "Check for null data after decoding a data: url." 2010-02-02 09:46:44 -08:00
Vasu Nori
8fccf67fa5 Merge "add instrumentation to log the sql statement + bindargs + databasename" 2010-02-02 09:38:52 -08:00
Patrick Scott
8af3cfc2a4 Check for null data after decoding a data: url. 
Refactor StreamLoader and friends since they all use a Context.  Change the
successful status to 200 instead of 0. Not sure why it was ever 0.

Bug: 2364322
 2010-02-02 11:20:54 -05:00
Andrei Popescu
5e7bb0a9ca Implement support for v8 counters 2010-02-02 11:40:20 +00:00
Vasu Nori
4dd4ab4cc3 add instrumentation to log the sql statement + bindargs + databasename 
capture the sql statement along with the bindargs passed in. this will help
one to see the sql statements being executed and hopefully will help
debug incorrect-sql bugs.
 2010-02-01 23:05:33 -08:00
Mike LeBeau
d615c6f330 Merge "Provide another extra for ACTION_VOICE_SEARCH_RESULTS that indicates the base url to be used when interpreting html results given in EXTRA_VOICE_SEARCH_RESULT_HTML." 2010-02-01 15:54:16 -08:00
Chris Tate
125d4072d8 Merge "Streamline: use Messages sent to a Handler subclass instead of posting Runnables" 2010-02-01 15:53:34 -08:00
Grace Kloba
34d7a9fbf5 Merge "Remove the obsolete unused hidden constant." 2010-02-01 15:35:34 -08:00
Christopher Tate
d3cd359122 Streamline: use Messages sent to a Handler subclass instead of posting Runnables 
Change-Id: I0ecbd2145300962839c0f87b761768a3bca4f010
 2010-02-01 15:31:09 -08:00
Joe Onorato
1f9a3cc338 Merge "Fix bug 2389454 - DateTimeView can NPE if "date_format" isn't set in Settings." 2010-02-01 15:15:19 -08:00
Joe Onorato
7747210426 Fix bug 2389454 - DateTimeView can NPE if "date_format" isn't set in Settings. 2010-02-01 18:14:15 -05:00
Grace Kloba
e8fe0e35e5 Remove the obsolete unused hidden constant. 2010-02-01 15:08:40 -08:00
Mike LeBeau
f9271c8b7d Provide another extra for ACTION_VOICE_SEARCH_RESULTS that indicates 
the base url to be used when interpreting html results given in
EXTRA_VOICE_SEARCH_RESULT_HTML.
 2010-02-01 15:07:13 -08:00
Shimeng (Simon) Wang
8a7ac8db1a Anchor the page at top left corner when webView size changed. 
Bug: 2356891
	modified:   core/java/android/webkit/WebView.java
 2010-02-01 15:06:38 -08:00
Romain Guy
2456248712 Do not reshow the filter popup after hiding it. 
This was causing the popup to show after moving a list out of the screen in
the new music app.
 2010-02-01 14:58:06 -08:00
Adam Powell
e4e460f67b Merge "Overscrolling in AbsListView; visibility cleanup for FlingRunnable" 2010-02-01 14:24:18 -08:00
Adam Powell
79ac3395b5 Overscrolling in AbsListView; visibility cleanup for FlingRunnable 2010-02-01 14:19:31 -08:00
Mike LeBeau
54ab1fadfa Merge "Add a set of hidden constants for the ACTION_VOICE_SEARCH_RESULTS intent. This will not be unhidden for Froyo as nothing will implement it until later, but I wanted to have the definition explicit in the framework." 2010-02-01 12:59:31 -08:00
Amith Yamasani
504e07134e Merge "Fix an NPE in SearchDialog when clicking on Mic button. Bug: 2410605" 2010-02-01 12:37:58 -08:00
Amith Yamasani
0f55b197aa Fix an NPE in SearchDialog when clicking on Mic button. Bug: 2410605 2010-02-01 12:13:39 -08:00
Mike LeBeau
41b14e8ff7 Add a set of hidden constants for the ACTION_VOICE_SEARCH_RESULTS intent. 
This will not be unhidden for Froyo as nothing will implement it until
later, but I wanted to have the definition explicit in the framework.
 2010-02-01 11:54:11 -08:00
Oscar Montemayor
cdc428bdb7 Apps on SD project. 
Javadoc fixes for new method in PackageManager class.
 2010-02-01 11:36:04 -08:00
San Mehat
1b7f7cfab6 StorageManager: Introduce StorageManager 
StorageManager provides an API for applications to receive storage
notifications on the app main thread.

Signed-off-by: San Mehat <san@google.com>
 2010-02-01 10:47:02 -08:00
Grace Kloba
a7bc87cb6a Added pause/resume update Picture to WebViewCore. 
When animating zoom, we pause updating picture for
smooth animation.

Fix http://b/issue?id=2359016

Remove the unused param in reducePriority/resumePriority
 2010-02-01 09:45:59 -08:00
Wu-cheng Li
6c8d276073 Add focal length and view angle API. 
bug:2375989,2375987
 2010-01-30 20:36:04 +08:00
Wu-cheng Li
4c4300c712 Add Camera.getSupportedThumbnailSizes() and Size.equals(). 
bug:2375986
 2010-01-30 19:44:52 +08:00
Dianne Hackborn
4bc1772cca Merge "Fix sample code insertion." 2010-01-29 19:13:11 -08:00
Dianne Hackborn
ab8a8ed2eb Fix sample code insertion. 2010-01-29 19:11:26 -08:00
Jim Miller
798c4b985d am 3a8a2818: am d8a3a895: Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call. 
Merge commit '3a8a28185bc26ccfdf847016d5a40af35436ca97'

* commit '3a8a28185bc26ccfdf847016d5a40af35436ca97':
  Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
 2010-01-29 18:12:47 -08:00