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

39189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
5e96448fd9 am 58818ab5: Merge "Fix the build" into honeycomb 
* commit '58818ab5b5dd14f5b40602cd07114de78c110b58':
  Fix the build
 2011-01-10 17:34:22 -08:00
Leon Scroggins
919022f916 am 86e1fa64: Remove nativeCursorMatchesFocus, which is no longer necessary. 
* commit '86e1fa647f7541b091753cf6a2314935b1011406':
  Remove nativeCursorMatchesFocus, which is no longer necessary.
 2011-01-10 17:32:10 -08:00
Romain Guy
58818ab5b5 Merge "Fix the build" into honeycomb 2011-01-10 17:30:57 -08:00
Romain Guy
c71ad30f0c Fix the build 
Change-Id: I39fde4140240bdd7fdb5d2823e990efbfde4a83e
 2011-01-10 17:33:55 -08:00
Leon Scroggins
86e1fa647f Remove nativeCursorMatchesFocus, which is no longer necessary. 
Bug:3335014

Requires a change in external/webkit.

Change-Id: I1dbaa73e86f312c6142c915e8cb252cf238f09c3
 2011-01-10 17:28:02 -08:00
Robert Greenwalt
7710465f38 am 55ccb887: Merge "Don\'t check for services before boot-complete" into honeycomb 
* commit '55ccb8877549c539daa9b78d370452680045a77b':
  Don't check for services before boot-complete
 2011-01-10 17:15:16 -08:00
Robert Greenwalt
55ccb88775 Merge "Don't check for services before boot-complete" into honeycomb 2011-01-10 17:13:24 -08:00
Jeff Brown
a3d4420b36 am f900fed8: Merge "Fix NPEs in detached views." into honeycomb 
* commit 'f900fed8826ad41f8e280537262dea506d177382':
  Fix NPEs in detached views.
 2011-01-10 17:13:08 -08:00
Jeff Brown
f900fed882 Merge "Fix NPEs in detached views." into honeycomb 2011-01-10 17:11:34 -08:00
Robert Greenwalt
03b15b976c Don't check for services before boot-complete 
fixes the build

Change-Id: I2ee55d9aaad53dac16fa8182df3a7b43b57eb719
 2011-01-10 17:09:25 -08:00
Mike Lockwood
b0dbc1b5a6 am f9a04233: @hide android.permission.WRITE_MEDIA_STORAGE 
* commit 'f9a04233c1db22a6ddd989b55db725badeae7539':
  @hide android.permission.WRITE_MEDIA_STORAGE
 2011-01-10 17:02:42 -08:00
Mike Lockwood
f9a04233c1 @hide android.permission.WRITE_MEDIA_STORAGE 
This permission is not needed for non-system or unbundled apps,
so we don't need it in the public API

Change-Id: I1a2a0349c6c5b7b5dc3104d69f4e39e95b878db9
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-10 19:59:02 -05:00
Romain Guy
3b703f2d11 Hide Canvas.getGL() 
Change-Id: I6d81cf9f43ce0c990fe30b3b3159c95ac738ae79
 2011-01-10 16:42:55 -08:00
Romain Guy
c39adfd005 am 3b703f2d: Hide Canvas.getGL() 
* commit '3b703f2d11f20efaa953ad31d6c97fe3561efb03':
  Hide Canvas.getGL()
 2011-01-10 16:41:54 -08:00
Alex Sakhartchouk
20cbfc4274 am fe852e21: Updating cubemap loading code. 
* commit 'fe852e216fdfab20e7b3d3e55247f70634d267b9':
  Updating cubemap loading code.
 2011-01-10 16:29:27 -08:00
Jeff Brown
b3ea92235c Fix NPEs in detached views. 
Bug: 3297518
Change-Id: Ife1384f3a5bebbd28a29f97dc6d519f8a0b10ba9
 2011-01-10 16:26:36 -08:00
Alex Sakhartchouk
fe852e216f Updating cubemap loading code. 
Change-Id: I93bb00e5fd1ccc622d17eba70a510664c2093723
 2011-01-10 15:57:57 -08:00
Vasu Nori
efd09ef46d am 3045bbaf: bug:3330569 print better message to help debug the problem 
* commit '3045bbaf58574ad3168466b198b835b29d174c18':
  bug:3330569 print better message to help debug the problem
 2011-01-10 15:49:20 -08:00
Vasu Nori
3045bbaf58 bug:3330569 print better message to help debug the problem 
methods such as SQLiteStatement.simpleQueryForString() expect
one and only row to be returned when the query is executed.
if the application provides a query that doesn't return any data,
then the error message printed is pretty confusing.

make it less confusing and print the query itself to help debug
the error.

Change-Id: Ife2066f3a3eab0b98845a49e8f72b518458a7757
 2011-01-10 15:37:47 -08:00
Dmitri Plotnikov
774cd32e0c am 817b3f93: Fixing field description. 
* commit '817b3f934271115258838d5cc4903ad5a2bef0f3':
  Fixing field description.
 2011-01-10 15:32:06 -08:00
Dmitri Plotnikov
817b3f9342 Fixing field description. 
PhoneLookup._ID is the contact id, not the data row id.

Change-Id: I51a308e26b93e178fde43123d0dfcb2b46630d6e
 2011-01-10 15:29:54 -08:00
Huahui Wu
ddf50607d1 am 0904c0dc: b/3302354 Always pass multi-touch events into WebKit, then handle them in WebView if preventDefault is not set. WebViewCore.java: add a MotionEvent field into TouchEventData for multi-touch so the extra data such as pressure, size can be preserved. WebVie 
* commit '0904c0dcfb11da9bb756b8d4f8a817b5efc9edc0':
  b/3302354 Always pass multi-touch events into WebKit, then handle them in WebView if preventDefault is not set. WebViewCore.java: add a MotionEvent field into TouchEventData for multi-touch so the extra data such as pressure, size can be preserved. WebView.java:   1. Extracted the common code for multi-touch and single touch to a new private function: handleTouchEventCommon()   2. Extracted the multi-touch code, including zooming and panning, to a new private function: handleMultiTouchInWebView()   3. In onTouchEvent(), single touch events keep the code path, but multi-touch events are always passed to Webkit first.   4. In Privatehandler.handleMessage(), if WebKit didn't consume the multi-touch event, the private handler calls the handleMultiTouchInWebView() to zoom and pan.
 2011-01-10 15:25:05 -08:00
Huahui Wu
0904c0dcfb b/3302354 Always pass multi-touch events into WebKit, then handle them in WebView if preventDefault is not set. 
WebViewCore.java: add a MotionEvent field into TouchEventData for multi-touch so the extra data such as pressure, size can be preserved.
WebView.java:
  1. Extracted the common code for multi-touch and single touch to a new private function: handleTouchEventCommon()
  2. Extracted the multi-touch code, including zooming and panning, to a new private function: handleMultiTouchInWebView()
  3. In onTouchEvent(), single touch events keep the code path, but multi-touch events are always passed to Webkit first.
  4. In Privatehandler.handleMessage(), if WebKit didn't consume the multi-touch event, the private handler calls the handleMultiTouchInWebView() to zoom and pan.

Change-Id: I3eba8812bd7cf6a298ff12e0b66223dae6725060
 2011-01-10 15:22:03 -08:00
Romain Guy
d2c78b3972 Fix the build. 
Change-Id: Ief8734697e8fdacb6fdbfdbd78793e06beb86d26
 2011-01-10 15:01:13 -08:00
Romain Guy
0a81b17fbf am d2c78b39: Fix the build. 
* commit 'd2c78b39724d1d7b6e4f7bd54d0022c2847e9127':
  Fix the build.
 2011-01-10 15:00:23 -08:00
Subir Jhanb
ebc5f20a26 am e896be71: Making the sync manager take the data connected value from ConnectivityManager and not from the intent. BUG:3337128 
* commit 'e896be71c70c7aaa86886fec1044c53e93c42621':
  Making the sync manager take the data connected value from ConnectivityManager and not from the intent. BUG:3337128
 2011-01-10 14:40:01 -08:00
Subir Jhanb
e896be71c7 Making the sync manager take the data connected value from ConnectivityManager and not from the intent. 
BUG:3337128

Change-Id: Ife2705569fcdde1b201773d6622a8a9d0b7ccfa1
 2011-01-10 14:18:09 -08:00
Stephen Hines
bf11e22684 am d94988bb: Merge "Split time functions into rs_time.rsh header." into honeycomb 
* commit 'd94988bb0cc65e5de71ab3c43ddf26e5c72dbc32':
  Split time functions into rs_time.rsh header.
 2011-01-10 14:16:26 -08:00
Stephen Hines
d94988bb0c Merge "Split time functions into rs_time.rsh header." into honeycomb 2011-01-10 14:14:35 -08:00
Romain Guy
67c796da27 am 778f5f95: Merge "Make sure onCancelled() is called if cancel() is called early." into honeycomb 
* commit '778f5f95d7f74ac12bc426c37dd1fc7abc05e15b':
  Make sure onCancelled() is called if cancel() is called early.
 2011-01-10 13:41:45 -08:00
Elliott Hughes
85a46c91f9 am 6452c259: Merge "Remove tests for dead API." into honeycomb 
* commit '6452c259e0547bcb5aede8d52e1307ee8cf86d89':
  Remove tests for dead API.
 2011-01-10 13:41:41 -08:00
Romain Guy
778f5f95d7 Merge "Make sure onCancelled() is called if cancel() is called early." into honeycomb 2011-01-10 13:39:41 -08:00
Elliott Hughes
6452c259e0 Merge "Remove tests for dead API." into honeycomb 2011-01-10 13:39:30 -08:00
Romain Guy
5ba812b9e9 Make sure onCancelled() is called if cancel() is called early. 
In some situations, when cancel() was called before the task had a
chance to start its execution, onCancelled() would not be invoked.

Change-Id: I6c1f4cd28a209fb8cc779bb212f500565dfceaae
 2011-01-10 13:33:12 -08:00
Jesse Wilson
48526d6994 am eb97c0dd: Patch new JSON APIs with changes informed by GSON. 
* commit 'eb97c0ddc063176c26065fc6855188edf0c16e03':
  Patch new JSON APIs with changes informed by GSON.
 2011-01-10 12:59:59 -08:00
Elliott Hughes
ffcac1a127 Remove tests for dead API. 
We removed the implementation, so there's no point trying to test it. (The
methods are still there for binary compatibility, which is why this still
compiled.)

Change-Id: I51f392f3dab542fca0c80fab4974354e2c689b9e
 2011-01-10 12:57:36 -08:00
Jesse Wilson
eb97c0ddc0 Patch new JSON APIs with changes informed by GSON. 
Change-Id: I86c12a123080cc06ab23d11d1563bb52c5902517
 2011-01-10 12:56:31 -08:00
Gilles Debunne
e79ea1dbc7 am b3fbd7e0: Merge "Stop text selection mode when new text replaces selection." into honeycomb 
* commit 'b3fbd7e0fd44a72fb7ccba0959481b8a806608b7':
  Stop text selection mode when new text replaces selection.
 2011-01-10 12:51:25 -08:00
Gilles Debunne
b3fbd7e0fd Merge "Stop text selection mode when new text replaces selection." into honeycomb 2011-01-10 12:49:23 -08:00
Leon Scroggins
f5f13669bb am e0b19124: Merge "Do not store the find callback until action mode starts." into honeycomb 
* commit 'e0b1912480d3c5cfa3f4cf3dd9d7cddd10d68c63':
  Do not store the find callback until action mode starts.
 2011-01-10 12:47:11 -08:00
Jamie Gennis
164cb00d96 am fbab3b67: Merge "Fix a bug in SurfaceTexture::setBufferCount." into honeycomb 
* commit 'fbab3b67afc904450613204400d9e8779feb5659':
  Fix a bug in SurfaceTexture::setBufferCount.
 2011-01-10 12:47:06 -08:00
Jamie Gennis
61e2ef0721 am ffe3f1cb: Merge "Add method logging to the SurfaceTexture C++ class." into honeycomb 
* commit 'ffe3f1cb16d37e56ab69ad345f47c6d3f52b916c':
  Add method logging to the SurfaceTexture C++ class.
 2011-01-10 12:47:03 -08:00
Jamie Gennis
3d25b74a87 am c936c5ce: Merge "Initialize the SurfaceTexture buffer slots." into honeycomb 
* commit 'c936c5cec648cd60637275fc6dba2265ae446044':
  Initialize the SurfaceTexture buffer slots.
 2011-01-10 12:47:00 -08:00
Leon Scroggins
e0b1912480 Merge "Do not store the find callback until action mode starts." into honeycomb 2011-01-10 12:41:20 -08:00
Jamie Gennis
fbab3b67af Merge "Fix a bug in SurfaceTexture::setBufferCount." into honeycomb 2011-01-10 12:30:33 -08:00
Jamie Gennis
ffe3f1cb16 Merge "Add method logging to the SurfaceTexture C++ class." into honeycomb 2011-01-10 12:30:14 -08:00
Jamie Gennis
c936c5cec6 Merge "Initialize the SurfaceTexture buffer slots." into honeycomb 2011-01-10 12:29:51 -08:00
Leon Scroggins
19abf2d7a5 Do not store the find callback until action mode starts. 
Bug:3331652

Prevents a bug where showFindDialog was apparently
called twice.

Change-Id: Ida473ef1b9b1b8b641fa3432b55d7a92eb7d0808
 2011-01-10 15:29:01 -05:00
Andy McFadden
d0a4c69e2a am 155b552b: Merge "Fix start-time setreuid complaints." into honeycomb 
* commit '155b552b1d7b8ff705c325ee435022cc135f6486':
  Fix start-time setreuid complaints.
 2011-01-10 12:08:43 -08:00
Andy McFadden
155b552b1d Merge "Fix start-time setreuid complaints." into honeycomb 2011-01-10 12:07:03 -08:00