11225 Commits

Author SHA1 Message Date
Romain Guy
ee9cdce64e Merge "Refactor HardwareRenderer to allow the use of OpenGL ES 2.0." 2010-06-10 18:52:47 -07:00
Romain Guy
e392499273 Refactor HardwareRenderer to allow the use of OpenGL ES 2.0.
The current OpenGL ES 2.0 HardwareRenderer will fail and does not
even attempt to create a Canvas. The next step will be to create
a new native-backed Canvas that relies on OpenGL ES 2.0 and bypasses
the current OpenGL ES 1.0 implementation done in Skia.

Change-Id: I7a8e9f87f316e9137ef191bb5609213e160eaa4c
2010-06-10 18:51:21 -07:00
Vasu Nori
707f03c5cf Merge "NPE in database corruption handler if attached database list is null" 2010-06-10 17:52:24 -07:00
Vasu Nori
49686ea3ed NPE in database corruption handler if attached database list is null
sometimes the database can be so corrupt that it cannot even be queried
for attached database list.

Change-Id: Ib8fe3bd94157acab3fbf1011c3f8a532ef5019f4
2010-06-10 17:40:01 -07:00
Mathias Agopian
9646b69388 am 5b669581: am 9d8e8dcc: Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken 2010-06-10 17:17:19 -07:00
Mathias Agopian
5b669581b3 am 9d8e8dcc: Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken 2010-06-10 17:15:12 -07:00
Mathias Agopian
9d8e8dcc84 Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken 2010-06-10 17:12:42 -07:00
Mathias Agopian
8b73ae4a1e fix [2757903] Crash in EGL when creating an EGLSurface
Change-Id: I995947ac40d1a5c86dce495550baf6864ecf5f54
2010-06-10 17:06:27 -07:00
Romain Guy
0a87ae799c Merge "Fix native crash when enabling hardware acceleration." 2010-06-10 16:19:51 -07:00
Romain Guy
c613328582 Fix native crash when enabling hardware acceleration.
This change also prevents hardware acceleration when the ViewRoot is in the
system process. This causes problem in EGL intialization because of having
both a SurfaceControl and a Surface. This is not needed and better to leave
it off anyway (so that preview windows don't get unnecessary hw acceleration.)

Change-Id: I1cc55d7fb9a4c1a9c4c59f11f49d3e44de78acef
2010-06-10 16:17:24 -07:00
Brad Fitzpatrick
b60c941811 resolved conflicts for merge of f37cbe6b to master
Change-Id: I529b17e55b9668f900f685f92e9831e14a82db05
2010-06-10 15:58:22 -07:00
Brad Fitzpatrick
f37cbe6bb6 am 438d0595: Introduce "StrictMode" 2010-06-10 15:03:26 -07:00
Brad Fitzpatrick
438d059512 Introduce "StrictMode"
This is a new public API for developers to opt-in to strict rules
about what they're allowed to do on certain threads.  (this is the
public face of the @hide dalvik.system.BlockGuard, added recently...)

In practice this will be used for developers to opt-in to declaring
that they don't want to be allowed to do various operations (such as
disk I/O or network operations) on their main UI threads.  (these
operations are often accidental, or even when they are fast come with
a good chance of being slow or very slow in some cases....)

Implementation wise, this is just a thread-local integer that has a
bitmask of the things that aren't allowed, and more bits for saying
what the violation penalty is.  The penalties, of which multiple can
be chosen, include:

  * logging
  * dropbox uploading for analysis/reporting
  * annoying dialog
  * full-on crashing

These are all only very roughly implemented at this point, but all
parts now minimally work end-to-end now, so this is a good checkpoint
commit before this gets too large.

Future CLs will polish all the above 4 penalties, including
checksumming of stacktraces and minimizing penalties for duplicate
violations.

Change-Id: Icbe61a2e950119519e7364030b10c3c28d243abe
2010-06-10 14:38:58 -07:00
Kenny Root
92a4d078e5 Merge "Move shaping to native." 2010-06-10 14:25:39 -07:00
Doug Felt
0c702b88c5 Move shaping to native.
Add internal API (getTextRunAdvances) to Paint, use when measuring.
Add internal API (getTextRunCursor) to Paint, use when determining
valid cursor positions.

Remove java-level shaping code.  Remove 'prep' code in TextLine
(except for replacement text) since shaping now is done on the fly as
needed in native.

Provide explicit shaping context bounds to internal text measuring,
cursor movement, and rendering APIs.

Update for to changes in external API in ushape.h.

Change-Id: I146958b624802ce8553125e5c3c6c03031bc9608
2010-06-10 14:03:22 -07:00
Mike Lockwood
dda5686092 MTP: Add support for retrieving thumbnails to MTP content provider.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-10 16:58:03 -04:00
Mike Lockwood
f724eed566 MTP provider: Add columns for MTP ObjectInfo dataset to the MTP objects table
Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: Ife0563ad1c3b3dbc2461e1a9e784cbb4653b3435
2010-06-10 14:08:29 -04:00
Irfan Sheriff
d649c12815 Make NetworkStateTracker an interface
As part of the WifiStateTracker cleanup, need
to have NetworkStateTracker as an interface.

Change-Id: I2ac48d7e4c7274ac4df40bc3b8591b182956a936
2010-06-10 10:55:23 -07:00
Kenny Root
051e19458d am c46f03e4: am 36921ad8: am b00854d4: Import revised translations 2010-06-09 22:35:55 -07:00
Kenny Root
c46f03e4a9 am 36921ad8: am b00854d4: Import revised translations 2010-06-09 22:33:47 -07:00
Kenny Root
36921ad858 am b00854d4: Import revised translations
Merge commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e' into kraken

* commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e':
  Import revised translations
2010-06-09 22:31:32 -07:00
Kenny Root
b00854d4c0 Import revised translations
Change-Id: I25faf1ade5252fa29cf43aa13e99fef9fc31b418
2010-06-09 22:25:58 -07:00
Dmitri Plotnikov
d92ea071c0 Adding a stopLoading() method.
This add an API to stop and remove a loader that
is no longer needed.

Change-Id: Ibe59981bb8bc9965a3360917e80b0e710efcd8e1
2010-06-09 20:20:38 -07:00
Romain Guy
0889adde3b Merge "Move OpenGL support out of ViewRoot into a new HardwareRenderer class." 2010-06-09 18:27:31 -07:00
Romain Guy
2d6145993e Move OpenGL support out of ViewRoot into a new HardwareRenderer class.
Change-Id: Iffaed924a5defc3c4df26223c390dc27eee115b1
2010-06-09 18:27:08 -07:00
Robert Greenwalt
9396f6e069 Merge "Clean up APN notifications." 2010-06-09 17:11:05 -07:00
Robert Greenwalt
02648a4b84 Clean up APN notifications.
Add APNType info to notifications so you can tell what's happening.  Now, even if a new APN
shares a connection with an already-connected-to- apn type, the new type will get all
the connecting and connected messages on connect and disconnecting/disconnected on disconnect
even though the shared connection remains connected.

Cleaning out the hacks MobileDataStateTracker needed to deal with the old situation.
bug:2226092

Change-Id: Iddd7421d6b91cda7c8405f9c3d5404ac04ef8e42
2010-06-09 16:52:01 -07:00
Jean-Baptiste Queru
e4031a3780 am 030b0ebe: merge from froyo-plus-aosp 2010-06-09 16:12:11 -07:00
Jean-Baptiste Queru
030b0ebebf merge from froyo-plus-aosp
Change-Id: Iad8617b45d406e7f737bf68ed723755363d27e9b
2010-06-09 16:09:19 -07:00
Joe Onorato
8a5f10b30d resolved conflicts for merge of f7b79151 to master
Change-Id: Ia4538f73d8bade9e6565835d484dcb650830feca
2010-06-09 15:07:16 -07:00
Joe Onorato
1d46191d88 am b5f9b4f1: am 302759c1: Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken 2010-06-09 14:47:43 -07:00
Joe Onorato
75144ea38e Move the status bar icon list, hopefully for the last time.
Change-Id: Ie495a41dac03e1fe5ddccefcbd2a0673090a6db1
2010-06-09 14:33:31 -07:00
Joe Onorato
f1f259165f Call into the notification manager when the panel is revealed.
This lets it turn off the LED.  However, it seems like somebody broke
the notification LEDs.  GRRR.

Change-Id: I3f7066c2b2e1673dc0144a34cf59946351a647be
2010-06-09 14:33:30 -07:00
Joe Onorato
7a0f36bd93 Move status_bar_latest_event and LatestItemView into SystemUI.apk.
Then, now that StatusBarManagerService is the only thing in that package,
move it up to the regular services package.  (I've been waiting for 4 years
to delete that package!)

Change-Id: If5faf44641319fd19e486d1f4e5bc1c6dfcff3ad
2010-06-09 14:33:30 -07:00
Joe Onorato
9e875fcb55 Start the status bar service based on a configuration option, instead of trampolining through
a braodcast receiver.

Change-Id: I6ae0740fea07350b80c35c0ee2d938e0364d773e
2010-06-09 14:33:29 -07:00
Joe Onorato
8bc6c51419 Require the STATUS_BAR_SERVICE permission for something to be the status bar.
Change-Id: I57b2d296e0d0cef0d256ae6697fffc47188d14df
2010-06-09 14:33:23 -07:00
Dianne Hackborn
b31e84bc45 Add Fragment option menu APIs.
Also fix up how transactions are handled so that a series of transactions
can correctly be created and committed.

Change-Id: I948ba47d49e9b2246a1958bd9eac9dd36dc5a855
2010-06-09 12:26:29 -07:00
The Android Open Source Project
c08fd46f5c merge from open-source master
Change-Id: I4ddfc902e70c85ab8b11698fc08df7247e46d0a9
2010-06-09 12:17:03 -07:00
The Android Open Source Project
3c259d3247 merge from open-source master
Change-Id: Iaf90d2aaa3cb3a435336c2ccd08b587d9fc3690b
2010-06-09 12:14:58 -07:00
Derek Sollenberger
369aca27ec Consolidate common zoom code and tighten access to some ZoomManager variables.
This is a single CL in a series of CL's that is focused on moving the
zoom logic from WebView to ZoomManager.

Change-Id: I741fc34d5dd481b89f6e0b33503834c33f4fe69e
http://b/2671604
2010-06-09 14:11:59 -04:00
Jean-Baptiste Queru
9226a713ff Merge "Adding mimetypes to the mimetype map used in the web view" 2010-06-09 10:51:16 -07:00
Joe Onorato
005847b03b Handle errors inflating notifications (and their icons).
On an inflation error, the StatusBarService cleans up, removes / doesn't add
the views, and calls into the StatusBarManagerService, which tells the
NotificationManagerService to remove the notification.

That then calls all the way back into the StatusBarService, but I think being
extra careful is okay.  Throughout the status bar, it's all keyed off of the
IBinder key, so if the app comes in with a good notification while we're
cleaning up, we won't lose the new notification or anything like that.

Change-Id: Iea78a637495a8b67810c214b951d5ddb93becacb
2010-06-09 09:15:25 -07:00
Joe Onorato
fe4f3ae33c Move the usb mass storage notification & activity into SystemUI.apk.
Also fix the notification to show properly when the runtime is restarted.

Change-Id: Id0c7ef9f9dc9c9df18428cbaa7db1703f085137e
2010-06-09 09:15:25 -07:00
Viktor Yakovel
964be41e9e Fix incorrect calculation of start and end indices of changed text
- The problem is taht the calculation of indices does not take the
  difference in original and modified text lengths into account.
- If reportExtractedText() is called from the onDraw() function,
  mInputMethodState is not reset.

The error can occur when the user is editing formatted text using a full screen editor.
One example of formatted text is phone numbers (e.g. dashes are added to North American
numbers by the PhoneNumberFormattingTextWatcher class).
If the two first digits are removed from the number 555-666-777, the new number becomes 566--777.
This is due incorrect calculation of start and end indices of the changed text. The error is in
the TextView class and the problem is that the calculation does not take the difference in original
and modified text lengths into account.

Change-Id: If12d0f571873a6f1874102377432affb64ee21e8
2010-06-09 09:14:37 -07:00
Derek Sollenberger
293c360ffe Move pinch-to-zoom logic into ZoomManager.
This CL is one in a series of CL's that moves the zoom logic
from WebView into ZoomManager.

Change-Id: I9980dd78dbc3345d465d4f39afcfd2f025f45bcb
http://b/2671604
2010-06-09 11:53:10 -04:00
The Android Open Source Project
6ac4e4c755 merge from open-source master
Change-Id: I1fd774738c01a2cdffac0d455c63d574131e6fb8
2010-06-09 07:14:36 -07:00
Konstantin Lopyrev
c857740f24 Adding support for minimum number of non letter characters.
Change-Id: If54cb7209d65eef826d474d7e0dbbef63d2f2b47
2010-06-08 19:06:11 -07:00
Adam Powell
db479c9af0 Merge "Dropdown mode for ActionBar; style and API updates" 2010-06-08 17:27:09 -07:00
Jim Miller
1a0ce1cc6f am db603bb5: am 3b68548d: am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo 2010-06-08 16:37:12 -07:00
Jim Miller
3b68548da6 am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo
Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into kraken

* commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
  Fix 2737842: Disable KeguardManager API if device policy is enabled
2010-06-08 16:33:26 -07:00