8586 Commits

Author SHA1 Message Date
Mike Lockwood
e0a89f611d MTP: Add host support for deleting objects.
For example, deleting pictures on a digital camera.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-11 17:47:35 -04:00
Dianne Hackborn
cf0a99910c am 4d4f265e: am 9f8cc518: Merge "Adjust activity manager process OOM adj." into kraken
Merge commit '4d4f265e6b6ccfc239150bd71aa2ce2b8de6237f'

* commit '4d4f265e6b6ccfc239150bd71aa2ce2b8de6237f':
  Adjust activity manager process OOM adj.
2010-06-11 11:00:53 -07:00
Dianne Hackborn
4d4f265e6b am 9f8cc518: Merge "Adjust activity manager process OOM adj." into kraken
Merge commit '9f8cc518e14c7a34bc52da712afbf02d84585f67' into gingerbread-plus-aosp

* commit '9f8cc518e14c7a34bc52da712afbf02d84585f67':
  Adjust activity manager process OOM adj.
2010-06-11 10:58:48 -07:00
Dianne Hackborn
32907cfb38 Adjust activity manager process OOM adj.
Modify OOM adj classes a bit, to take into account the new
heavy weight app type, and give "foreground services" their
own category to have a bettery chance to manager them when
things go wrong.

Also add some new code to battery stats to keep a history
of changes to the battery level.

Change-Id: I29f5ab6938777e1a7eafd7d8c38b5e564cc9f96a
2010-06-11 10:39:11 -07:00
Derek Sollenberger
bffa851f04 Finish refactoring zoom logic from WebView to ZoomManager.
This is the final CL in a series of CL's that moved the
location of the zoom logic from WebView to ZoomManager.

Change-Id: Ie1e80b9b3108bd4cb0b0ee2822dc984da91c2d86
http://b/2671604
2010-06-11 08:51:07 -04:00
Derek Sollenberger
15c5ddb7fd Refactor the double tap zoom code into ZoomManager.
This CL is one in a series of CL's that is intended to refactor
the zoom logic from WebView to ZoomManager.

Change-Id: Icf88f7bd45068dddb31913903403acc7a8f21063
http://b/2671604
2010-06-11 07:47:52 -04:00
Chih-Chung Chang
4b983d9f30 am dac5e001: am b8bb78f5: Change camera interface to support multiple cameras.
Merge commit 'dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9'

* commit 'dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9':
  Change camera interface to support multiple cameras.
2010-06-11 03:39:17 -07:00
Chih-Chung Chang
dac5e0013d am b8bb78f5: Change camera interface to support multiple cameras.
Merge commit 'b8bb78f54b48868465a9d69d65fda08524ab5ae1' into gingerbread-plus-aosp

* commit 'b8bb78f54b48868465a9d69d65fda08524ab5ae1':
  Change camera interface to support multiple cameras.
2010-06-11 03:27:30 -07:00
Chih-Chung Chang
b8bb78f54b Change camera interface to support multiple cameras.
Change-Id: Ie88fe706d2278acf762eca87780de349434778a4
2010-06-11 16:47:33 +08:00
Wu-cheng Li
6df7225660 am e5dd62e8: am 2fd73a45: Unhide camera metering mode API.
Merge commit 'e5dd62e873448fd8c1fd8e80739b58bda649a6e7'

* commit 'e5dd62e873448fd8c1fd8e80739b58bda649a6e7':
  Unhide camera metering mode API.
2010-06-11 00:35:06 -07:00
Wu-cheng Li
e5dd62e873 am 2fd73a45: Unhide camera metering mode API.
Merge commit '2fd73a452268d2acb6e72a1d23a422085ed3c510' into gingerbread-plus-aosp

* commit '2fd73a452268d2acb6e72a1d23a422085ed3c510':
  Unhide camera metering mode API.
2010-06-11 00:33:37 -07:00
Wu-cheng Li
2fd73a4522 Unhide camera metering mode API.
Change-Id: Ia3ca83e2a0b5b322e5dbf9ae3d5c1d3b89e0fd31
2010-06-11 15:29:49 +08:00
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
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
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
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
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
Jim Miller
c19dade5a4 am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo
Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into froyo-plus-aosp

* commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
  Fix 2737842: Disable KeguardManager API if device policy is enabled
2010-06-08 16:33:22 -07:00
Jim Miller
75b6a6b972 Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo 2010-06-08 16:31:32 -07:00
Jim Miller
284b62e1b8 Fix 2737842: Disable KeguardManager API if device policy is enabled
This change adds notification to find out when the device policy
has changed.  When an admin adds or changes a policy, we get notified
and reset the state of keyguard to be enabled.

It also moves disabling keyguard into the TokenWatcher.acquired()
method to avoid disabling keyguard when a policy doesn't permit it.
This avoids reference counting issues in TokenWatcher and hence relieves
the ordering issue.

There is one remaining caveat. An application that uses KeyguardManager
to disable keyguard will need to disable keyguard again after any
policy change.

Tested:

Install and run app that disables keyguard with no admin. Result: keyguard is enabled/disabled as expected.
Enable admin and set quality = "something" after installing & running app. Result: keyguard is enabled.
Change admin password quality to "unspecified" and re-run app (per caveat). Result: keyguard is disabled.
Change admin password quality to "something" again. Result: keyguard is enabled.
Disable admin : Result: keyguard is enabled until app runs again (per caveat).

Added minor cosmetic changes after review.

Change-Id: I302f2b01446bf031f746b0f3e8b5fd7a6cc0e648
2010-06-08 15:47:52 -07:00
Jean-Baptiste Queru
32d0d8fcc8 Merge "Bluetooth:LCD wakeup during remote BT pairing request. This change fixes the issue of LCD not coming up during remote initiated pairing request when android is in suspend" 2010-06-08 15:43:02 -07:00
Adam Powell
a408291e22 Dropdown mode for ActionBar; style and API updates 2010-06-08 14:25:24 -07:00