Commit Graph

11904 Commits

Author SHA1 Message Date
Derek Sollenberger
a559e8b62e Merge "fix NullPointerException caused by inflating XML Webview that is defined to be non-visible." 2010-06-25 04:28:50 -07:00
Romain Guy
ca9d544e38 Merge "Add colored rectangles implementation in OpenGLRenderer." 2010-06-24 19:32:44 -07:00
Romain Guy
9d5316e3f5 Add colored rectangles implementation in OpenGLRenderer.
Drawing two rectangles one after the other discards the second one because of
Z buffering issues. This will be fixed in another changelist.

Change-Id: Ida1b3cde8a78e60cacc07e477abc44def527ff67
2010-06-24 19:30:36 -07:00
Dianne Hackborn
8bb998d52c am ea8eafad: am 2529a453: Merge "Make bad notifications crash their application." into gingerbread
Merge commit 'ea8eafad4f5438ec1291d45376959a996d36e15e'

* commit 'ea8eafad4f5438ec1291d45376959a996d36e15e':
  Make bad notifications crash their application.
2010-06-24 17:33:14 -07:00
Dianne Hackborn
ea8eafad4f am 2529a453: Merge "Make bad notifications crash their application." into gingerbread
Merge commit '2529a45339b7e02d9d2b813358bcecd144a971ea' into gingerbread-plus-aosp

* commit '2529a45339b7e02d9d2b813358bcecd144a971ea':
  Make bad notifications crash their application.
2010-06-24 17:30:42 -07:00
Dianne Hackborn
9d39d0cb36 Make bad notifications crash their application.
Implement notification manager handling of bad notifications, to
call a new activity manager to have the owner's process crashed
(if there is one).

Change-Id: Ib15e8d0c598756f3b39c99cc2045c18e054daf6b
2010-06-24 17:27:28 -07:00
Dianne Hackborn
36e5f667bc resolved conflicts for merge of 2eb12a47 to master
Change-Id: I79eb9d9f083e51ec1b99145d81632683669e7a99
2010-06-24 16:29:54 -07:00
Dianne Hackborn
2eb12a4722 am 01e4cfc4: Some ActivityThread/ActivityManager cleanup.
Merge commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301' into gingerbread-plus-aosp

* commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301':
  Some ActivityThread/ActivityManager cleanup.
2010-06-24 15:23:59 -07:00
Dianne Hackborn
01e4cfc47d Some ActivityThread/ActivityManager cleanup.
- Move PackageInfo out of ActivityThread, renaming to LoadedApk.
- Rename some of the other PacakgeInfo inner classes to better
  represent what they are.
- Rename HistoryRecord to ActivityRecord.
- Introduce AppGlobals, to eventually let ActivityThread become
  package scoped.

Change-Id: Ib714c54ceb3cdbb525dce3db9505f31042e88cf0
2010-06-24 15:20:48 -07:00
Gilles Debunne
b6ca723142 Fixed bug 2795971 IME doesn't appear on touching a text field
Refactoring in CL 55138 added an extra condition to display the IME.

Change-Id: I2a4cc83bb39bd2c87ad3bd75ef234cdbdfdad74f
2010-06-24 13:42:34 -07:00
Derek Sollenberger
f39d26605d fix NullPointerException caused by inflating XML Webview that is
defined to be non-visible.

Change-Id: I3233428d1cc74e90c6431cc1796592af6a7a62d8
http://b/2794841
2010-06-24 16:41:04 -04:00
Dianne Hackborn
5eceb79a19 am 82677b95: am e57c3a88: Merge "Add APIs for finding heavy-weight apps." into gingerbread
Merge commit '82677b9585968806800abff65c5b1529f509a313'

* commit '82677b9585968806800abff65c5b1529f509a313':
  Add APIs for finding heavy-weight apps.
2010-06-24 12:46:31 -07:00
Dianne Hackborn
82677b9585 am e57c3a88: Merge "Add APIs for finding heavy-weight apps." into gingerbread
Merge commit 'e57c3a88b99856d1e69fdf115e7c7954594b7385' into gingerbread-plus-aosp

* commit 'e57c3a88b99856d1e69fdf115e7c7954594b7385':
  Add APIs for finding heavy-weight apps.
2010-06-24 12:42:55 -07:00
Dianne Hackborn
baf42c625c Add APIs for finding heavy-weight apps.
Change-Id: I6c865cce404cac1a08eee056f963de5d276d5898
2010-06-24 11:38:47 -07:00
Steve Block
3d9bdc3979 Merge "Add a splash screen to the webruntime." 2010-06-24 10:47:15 -07:00
Ben Murdoch
b5c49c8bb1 Add a splash screen to the webruntime.
Bug: 2766920
Change-Id: Ie40627aa50e849b49177f79aa129242eb1d2f2a8
2010-06-24 18:45:34 +01:00
Mike Lockwood
57c798ade1 Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
We now broadcast Usb.ACTION_USB_CONNECTED and Usb.ACTION_USB_DISCONNECTED
when USB is connected or disconnected.
The ACTION_USB_CONNECTED extras indicate the enabled/disabled state of
all USB functions.

Change-Id: I919fcd5aa8d640d051cec87053f474a9843ed545
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-24 13:14:05 -04:00
Mike Lockwood
5da347dd2d am 477def1d: Merge changes I11495d03,If5816721 into gingerbread
Merge commit '477def1d4216f82bdfe58525131db88b384fc5a5' into gingerbread-plus-aosp

* commit '477def1d4216f82bdfe58525131db88b384fc5a5':
  Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
  DO NOT MERGE Add new permission to allow access to USB devices
2010-06-24 09:28:59 -07:00
Mike Lockwood
2423607a32 Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
We now broadcast Usb.ACTION_USB_CONNECTED and Usb.ACTION_USB_DISCONNECTED
when USB is connected or disconnected.
The ACTION_USB_CONNECTED extras indicate the enabled/disabled state of
all USB functions.

Change-Id: I11495d039429dbe22bd738067296e39ae415befa
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-24 09:36:50 -04:00
Steve Block
abe9e69c45 Merge "Fixes use of permission string in WebRuntimeActivity" 2010-06-24 06:16:15 -07:00
Steve Block
c9eecb274b Fixes use of permission string in WebRuntimeActivity
Bug: 2766920
Change-Id: I01bc02c99808b31efa34e33754905091b9370b3a
2010-06-24 10:36:22 +01:00
Joe Onorato
a18dbdf420 am 801b63d3: am 51e895f0: Merge "Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout changed." into gingerbread
Merge commit '801b63d3b865054b3015e2cf315ca7c9386d1212'

* commit '801b63d3b865054b3015e2cf315ca7c9386d1212':
  Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
2010-06-23 17:50:42 -07:00
Romain Guy
038ecb097a Merge "Add support for transformations." 2010-06-23 17:50:02 -07:00
Joe Onorato
801b63d3b8 am 51e895f0: Merge "Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout changed." into gingerbread
Merge commit '51e895f055f76ad0114a18e1b754a1475a62c524' into gingerbread-plus-aosp

* commit '51e895f055f76ad0114a18e1b754a1475a62c524':
  Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
2010-06-23 17:48:18 -07:00
Romain Guy
f6a11b8a9e Add support for transformations.
This change adds partial support for the following transforms:
- scale()
- translate()
- rotate()
- setMatrix()
- getMatrix()

The transform is stored in a snapshot and saved/restored as needed.
The transform is currently not applied to the clip rect and is not
mapped to the vertex shader.

Change-Id: Id48993453311200804149917d0c126a4d0471226
2010-06-23 17:47:49 -07:00
Joe Onorato
c27bb55980 Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
changed.

Bug: 2772728
Change-Id: I9e230fbe42d01cfc953cdafb86dd0d616d96a3ea
2010-06-23 17:44:30 -07:00
Dianne Hackborn
f92f8686f9 am 98f7aed6: am 1e4b9f39: Remove InputConsumer, replacing with InputQueue.
Merge commit '98f7aed66b54c365f816fe990de978f61155cde1'

* commit '98f7aed66b54c365f816fe990de978f61155cde1':
  Remove InputConsumer, replacing with InputQueue.
2010-06-23 14:43:31 -07:00
Dianne Hackborn
98f7aed66b am 1e4b9f39: Remove InputConsumer, replacing with InputQueue.
Merge commit '1e4b9f3936d6f357e89360293e05a0e16d5fa440' into gingerbread-plus-aosp

* commit '1e4b9f3936d6f357e89360293e05a0e16d5fa440':
  Remove InputConsumer, replacing with InputQueue.
2010-06-23 14:40:36 -07:00
Dianne Hackborn
1e4b9f3936 Remove InputConsumer, replacing with InputQueue.
Change-Id: Ib06907278457aaee842b123adc072840ca3602d8
2010-06-23 14:37:30 -07:00
Shimeng (Simon) Wang
da91bf5c13 Merge "Tweak fix for setXSSAuditorEnabled in LayoutTestController." 2010-06-23 14:15:20 -07:00
Elliott Slaughter
be1304f0c2 Tweak fix for setXSSAuditorEnabled in LayoutTestController.
Change-Id: Iba9b67da8628e3880e8f6b18d2dc51337b9c58fb
2010-06-23 14:11:37 -07:00
Daniel Sandler
4ecdad302f am c82b4e80: am 69a4817e: Immersive activity API.
Merge commit 'c82b4e80b8211851963929b33592bbc50358525b'

* commit 'c82b4e80b8211851963929b33592bbc50358525b':
  Immersive activity API.
2010-06-23 13:37:59 -07:00
Daniel Sandler
c82b4e80b8 am 69a4817e: Immersive activity API.
Merge commit '69a4817e3e1e368e758ff8c238deb5ee26963c04' into gingerbread-plus-aosp

* commit '69a4817e3e1e368e758ff8c238deb5ee26963c04':
  Immersive activity API.
2010-06-23 13:36:25 -07:00
Daniel Sandler
69a4817e3e Immersive activity API.
An Activity can declare itself to be "immersive" either by
setting android:immersive="true" in AndroidManifest or by
calling setImmersive(true).

Immersive activities "should" not be interrupted, for
example by Notifications with an associated
fullScreenIntent. (In the future we may even prevent any
non-system application from successfully calling
startActivity() if the foreground activity is immersive.)
Notifications with FLAG_HIGH_PRIORITY set will be shown to
the user in some less-obtrusive way if the frontmost
activity is immersive.

Change-Id: I8d0c25cc4e22371c27cbf2bb6372d2c95d57b2d7
2010-06-23 16:29:36 -04:00
Marco Nelissen
41b839b983 Merge "Fix 2655246 file descriptor leak when accessing thumbnails http://b/2655246" 2010-06-23 12:42:30 -07:00
Adam Powell
c047b95636 am bc337d2f: am 73ccafb5: Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread
Merge commit 'bc337d2f675e8417be5534439e1b4ed1bc45a9c7'

* commit 'bc337d2f675e8417be5534439e1b4ed1bc45a9c7':
  Fix a bug where requestDisallowInterceptTouchEvent does not get called
2010-06-23 12:41:46 -07:00
Romain Guy
bb9524b6bd Add implementations for clipRect(), save() and restore().
The current implementation of clipRect() does not apply local transformations
before setting the new clip.

Change-Id: I5997871bb638dfcd1a8ef96354846af52427e445
2010-06-23 12:36:03 -07:00
Ray Chen
1ba38b600e Fix 2655246 file descriptor leak when accessing thumbnails
http://b/2655246

Moved from kraken to master (https://android-git.corp.google.com/g/#change,51691)

Change-Id: I7d0cffd745311d073415d597eb141e26fe1edcce
2010-06-23 11:32:40 -07:00
Gilles Debunne
03f0292744 New XmlDocumentProvider class.
Minor changes in the Adapters.java helper class.

Extracts data out of a XML document using an XPath-like syntax.

Change-Id: I0617b0783f11c86118b42cd8485d54440810c805
2010-06-23 10:43:00 -07:00
Dianne Hackborn
320742b15a am e3e2883f: am e24a60aa: Merge "First stab at attaching native event dispatching." into gingerbread
Merge commit 'e3e2883f2232007174ead562610eb01201890d9b'

* commit 'e3e2883f2232007174ead562610eb01201890d9b':
  First stab at attaching native event dispatching.
2010-06-23 10:32:25 -07:00
Daniel Sandler
c4c6635d1a am 57b53265: am ef730e6e: Merge "Fix javadocs." into gingerbread
Merge commit '57b5326561b6edb22b09016985b41b7cdb2156c0'

* commit '57b5326561b6edb22b09016985b41b7cdb2156c0':
  Fix javadocs.
2010-06-23 10:32:02 -07:00
Daniel Sandler
6c55b8b143 am 71764c4c: am 613dde4a: Revised "immersive mode" API.
Merge commit '71764c4ce5b248a79542238b171a783e82e0fe37'

* commit '71764c4ce5b248a79542238b171a783e82e0fe37':
  Revised "immersive mode" API.
2010-06-23 10:31:21 -07:00
Adam Powell
bc337d2f67 am 73ccafb5: Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread
Merge commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf' into gingerbread-plus-aosp

* commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf':
  Fix a bug where requestDisallowInterceptTouchEvent does not get called
2010-06-23 10:28:00 -07:00
Mathias Agopian
dc79f0f2da am bf900939: am 7e73a2ce: Merge "Improve SensorManager documentation" into gingerbread
Merge commit 'bf9009396b1cba1f99f65c0ea9f5ef8532df1ab6'

* commit 'bf9009396b1cba1f99f65c0ea9f5ef8532df1ab6':
  Improve SensorManager documentation
2010-06-23 10:17:42 -07:00
Jeff Brown
e981c883d5 am b1efc3f6: am 7fbdc84e: More native input event dispatching.
Merge commit 'b1efc3f68277a8c38c21e2d2e8ce05287118ecfe'

* commit 'b1efc3f68277a8c38c21e2d2e8ce05287118ecfe':
  More native input event dispatching.
2010-06-23 10:17:22 -07:00
Steve Block
7fb6a8b345 Merge "Adds a Geolocation permission handler to the WebRuntime" 2010-06-23 07:45:51 -07:00
Steve Block
1218fcec07 Adds a Geolocation permission handler to the WebRuntime
This always allows or denies permission, depending upon the app's permissions

Bug: 2766920
Change-Id: If8f617560c4a10f242efae9accc0653ffe693a0a
2010-06-23 15:42:39 +01:00
Kenny Root
24ca4545f3 Check for spanned before computing tab stops
Don't try to check for tab stop spans in non-Spanned text input.

Change-Id: I54d69c8e0246f5a38d0713a89b8b455a478285f0
2010-06-22 23:55:15 -07:00
Vasu Nori
8d1110383d if attach database sql statement is exec'ed, disable write WAL
an app can execute 'attach database..' statement anytime after WAL is
enabled. since WAL doesn't work with atatched databases,
disable WAL whenever the caller executes 'attach database'
sql statement.

Change-Id: I77dfcb744b59476c357d44296c14d63455985a7b
2010-06-22 18:34:21 -07:00
Adam Powell
110486f932 Fix a bug where requestDisallowInterceptTouchEvent does not get called
when scrolling is resumed after stopping a fling.

Change-Id: I6796c5082cb81b3116de5baf1f27fe3addb40d00
2010-06-22 17:14:44 -07:00