10692 Commits

Author SHA1 Message Date
Jeff Hamilton
34c9c882c4 am 6dc3f4e5: Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e' into eclair-plus-aosp

* commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e':
  Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
2009-10-10 11:26:43 -07:00
Jeff Hamilton
5d93de7393 am 6dc3f4e5: Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e' into eclair-mr2

* commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e':
  Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
2009-10-10 11:25:39 -07:00
Jeff Hamilton
6dc3f4e553 Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Change-Id: I45af1fe80f6f93a1db8389600dc780af9cedf22c
2009-10-10 12:50:25 -05:00
Fred Quintana
a5e44bbd37 am 083a50a3: Merge change I66693ea2 into eclair
Merge commit '083a50a394915b562ad53be9fd8ec7524e3db21c' into eclair-mr2

* commit '083a50a394915b562ad53be9fd8ec7524e3db21c':
  fix sync exponential backoff for expedited syncs
2009-10-09 21:15:55 -07:00
Fred Quintana
14d330899d am 083a50a3: Merge change I66693ea2 into eclair
Merge commit '083a50a394915b562ad53be9fd8ec7524e3db21c' into eclair-plus-aosp

* commit '083a50a394915b562ad53be9fd8ec7524e3db21c':
  fix sync exponential backoff for expedited syncs
2009-10-09 21:15:40 -07:00
Android (Google) Code Review
083a50a394 Merge change I66693ea2 into eclair
* changes:
  fix sync exponential backoff for expedited syncs
2009-10-10 00:10:29 -04:00
Dima Zavin
6261ab5422 Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
This reverts commit ed5ecdba36648973be3033a045e2ece8bf039e4a.
2009-10-09 18:23:08 -07:00
Android (Google) Code Review
1bb5550107 Merge change I85f598e0 into eclair-mr2
* changes:
  Prevent transparent region from getting out of sync with Surface Flinger
2009-10-09 20:40:26 -04:00
Dianne Hackborn
6ef69274f1 am ee110be0: Fix issue #2179891: Need to update 5.xml
Merge commit 'ee110be02256b816ac6d863e39cb8b11b8071baa' into eclair-plus-aosp

* commit 'ee110be02256b816ac6d863e39cb8b11b8071baa':
  Fix issue #2179891: Need to update 5.xml
2009-10-09 17:39:26 -07:00
Dianne Hackborn
8a98a26aa2 am ee110be0: Fix issue #2179891: Need to update 5.xml
Merge commit 'ee110be02256b816ac6d863e39cb8b11b8071baa' into eclair-mr2

* commit 'ee110be02256b816ac6d863e39cb8b11b8071baa':
  Fix issue #2179891: Need to update 5.xml
2009-10-09 17:38:59 -07:00
Dianne Hackborn
aa80b60b59 Fix issue #2179931: Power key to wake up frequently ignored when in dock app
The dock app is forcing the screen to a particular brightness level.  This
causes the window manager to often call into the power manager with the
new brightness.  This causes us to go in to updateLightsLocked() to figure
out and apply the real brightness to use.  When the screen is off the
real brightness always remains 0, but even if it didn't change from the
last one we would start an animation which would when done put the system
to sleep and fight with the user trying to turn the device on.

Now, if the new target brightness is the same as the last one, we leave the
animation as-is -- either running or not as appropriate.

Change-Id: I067d55ea2b39e294c5d5291587a4d8727c0b8083
2009-10-09 17:38:26 -07:00
Jack Palevich
61a6e68918 Prevent transparent region from getting out of sync with Surface Flinger
The ViewRoot is responsible for calculating the current view's surface's
transparent region and reporting this to the window server, which in
turn notifies Surface Flinger.

To minimize cross-process traffic, ViewRoot keeps track of the
most recent transparent region that it has reported to the window
server, and only sends updates when the region shape changes.

ViewRoot is effectively shadowing the internal state of the window
server, and usually this works fine, because ViewRoot is usually the
only thing that changes this value.

But when the surface is recreated, the window server resets the
transparent region to empty. So in order to properly update the window
server we need to reset our copy of its state to empty too.

Fixes issue #2133090: GL Gears runs at half speed in some cases
2009-10-09 17:37:50 -07:00
Dianne Hackborn
ee110be022 Fix issue #2179891: Need to update 5.xml
Copied current.xml to 5.xml.

Change-Id: I5eaa806eef9a9a3135b021d7db179325ff7663fc
2009-10-09 16:41:40 -07:00
Fred Quintana
66693ea208 fix sync exponential backoff for expedited syncs 2009-10-09 16:32:02 -07:00
Romain Guy
ecc6f8773a am 8eb955b9: Merge change I5e482bbc into eclair
Merge commit '8eb955b934c49ce814bce1a84bc995eef849051d' into eclair-mr2

* commit '8eb955b934c49ce814bce1a84bc995eef849051d':
  Add new RenderScript sample: ImageProcessing.
2009-10-09 16:27:35 -07:00
Eric Fischer
8ec1ba6db5 am c08efb27: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'c08efb2712fbcc25ce9c208f3c9d7c0935e209d4' into eclair-mr2

* commit 'c08efb2712fbcc25ce9c208f3c9d7c0935e209d4':
  Import revised translations.  DO NOT MERGE
2009-10-09 16:27:19 -07:00
Romain Guy
1707488b56 am 8eb955b9: Merge change I5e482bbc into eclair
Merge commit '8eb955b934c49ce814bce1a84bc995eef849051d' into eclair-plus-aosp

* commit '8eb955b934c49ce814bce1a84bc995eef849051d':
  Add new RenderScript sample: ImageProcessing.
2009-10-09 16:13:18 -07:00
Eric Fischer
ea29a2fc6d am c08efb27: Import revised translations. DO NOT MERGE
Merge commit 'c08efb2712fbcc25ce9c208f3c9d7c0935e209d4' into eclair-plus-aosp

* commit 'c08efb2712fbcc25ce9c208f3c9d7c0935e209d4':
  Import revised translations.  DO NOT MERGE
2009-10-09 16:08:02 -07:00
Android (Google) Code Review
8eb955b934 Merge change I5e482bbc into eclair
* changes:
  Add new RenderScript sample: ImageProcessing.
2009-10-09 19:07:12 -04:00
Romain Guy
d7fa122dfe Add new RenderScript sample: ImageProcessing.
Change-Id: I5e482bbc34911c940a3a74258f8f8549b1939bc4
2009-10-09 16:05:25 -07:00
Eric Fischer
c08efb2712 Import revised translations. DO NOT MERGE
Approver: jerryw
2009-10-09 15:33:15 -07:00
Daisuke Miyakawa
a9a42a673f am ca103c16: Merge change I6ce46417 into eclair-mr2
Merge commit 'ca103c16d80aba1a9535e2eb4e13283258426395' into eclair-mr2-plus-aosp

* commit 'ca103c16d80aba1a9535e2eb4e13283258426395':
  Clean-up vCard code.
2009-10-09 13:38:29 -07:00
Android (Google) Code Review
ca103c16d8 Merge change I6ce46417 into eclair-mr2
* changes:
  Clean-up vCard code.
2009-10-09 16:31:33 -04:00
Daisuke Miyakawa
021de73623 Clean-up vCard code.
Note that refactor is still on-going. Some changes done now may be
reverted in the future.

- Move reusable constants from VCardComposer to Constants.
- Make ContactStruct appropriately refers to Constants.
- Move PBAP-related code at the bottom of vCard composer
- Remove some redundant code.

Internal issue number: 2160039
2009-10-09 13:28:05 -07:00
Grace Kloba
947a915743 am 94ab3b6d: Expose WebViewClient of WebView.
Merge commit '94ab3b6d0e9a5a914c7706ed1888c9d27756f7e4' into eclair-mr2-plus-aosp

* commit '94ab3b6d0e9a5a914c7706ed1888c9d27756f7e4':
  Expose WebViewClient of WebView.
2009-10-09 12:53:37 -07:00
Grace Kloba
94ab3b6d0e Expose WebViewClient of WebView. 2009-10-09 11:57:05 -07:00
Leon Scroggins
b3e3352fee am 70ca3c25: File upload.
Merge commit '70ca3c25b959427359bdb7cf37a8c3d6eb962357' into eclair-mr2-plus-aosp

* commit '70ca3c25b959427359bdb7cf37a8c3d6eb962357':
  File upload.
2009-10-09 10:59:48 -07:00
Leon Scroggins
70ca3c25b9 File upload.
Implement java side of file upload.  Requires changes to external/
webkit to not break; requires changes to packages/apps/Browser
before it actually is used.

Fix http://b/issue?id=675743
2009-10-09 13:48:28 -04:00
Daisuke Miyakawa
403b5cd405 am 6e15a70c: Merge change I1fb066b0 into eclair-mr2
Merge commit '6e15a70c79c360f6870b06610f61a7d02cb29b2c' into eclair-mr2-plus-aosp

* commit '6e15a70c79c360f6870b06610f61a7d02cb29b2c':
  Rename VCardTest.java to VCardImportTest.java.
2009-10-09 09:53:47 -07:00
Android (Google) Code Review
6e15a70c79 Merge change I1fb066b0 into eclair-mr2
* changes:
  Rename VCardTest.java to VCardImportTest.java.
2009-10-09 12:45:39 -04:00
Daisuke Miyakawa
3f15538a32 Rename VCardTest.java to VCardImportTest.java.
Internal issue number: 2160039
2009-10-09 09:43:57 -07:00
Ray Chen
7c86fc066a am 23a2d92f: Merge change Ib01005ea into eclair-mr2
Merge commit '23a2d92f2dd122a6f7ba39580b1d7be088ce6de0' into eclair-mr2-plus-aosp

* commit '23a2d92f2dd122a6f7ba39580b1d7be088ce6de0':
  Avoid extracting EXIF data for non-JPEG images.
2009-10-09 09:28:44 -07:00
Android (Google) Code Review
23a2d92f2d Merge change Ib01005ea into eclair-mr2
* changes:
  Avoid extracting EXIF data for non-JPEG images.
2009-10-09 12:21:37 -04:00
Andreas Huber
861c462c52 am 9b8f9477: Fixing the build.
Merge commit '9b8f947790aa1dabf9eb0621d0ac8f9d189116a2' into eclair-mr2-plus-aosp

* commit '9b8f947790aa1dabf9eb0621d0ac8f9d189116a2':
  Fixing the build.
2009-10-09 09:13:53 -07:00
Andreas Huber
9b8f947790 Fixing the build. 2009-10-09 09:06:06 -07:00
Andreas Huber
e1ba422636 am 936fff36: Merge change Ib64cab41 into eclair-mr2
Merge commit '936fff36882764ec031ae4fb8338273cc2abccd5' into eclair-mr2-plus-aosp

* commit '936fff36882764ec031ae4fb8338273cc2abccd5':
  Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.
2009-10-09 08:50:07 -07:00
Android (Google) Code Review
936fff3688 Merge change Ib64cab41 into eclair-mr2
* changes:
  Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.
2009-10-09 11:44:25 -04:00
Robert Greenwalt
c2bc31b45e am 2515cf85: am 98e0b146: Make PhoneStateListeners not call TelephonyManager
Merge commit '2515cf85d50ef137a6e4a15a79a75a51c923ce6f' into eclair-mr2-plus-aosp

* commit '2515cf85d50ef137a6e4a15a79a75a51c923ce6f':
2009-10-09 01:28:19 -07:00
Grace Kloba
4496a3feca am a1c0506e: am 1184313c: Setting WebCore cache limit depending on the memory class.
Merge commit 'a1c0506e3fd4793476712d34ed3a0f665f3336ad' into eclair-mr2-plus-aosp

* commit 'a1c0506e3fd4793476712d34ed3a0f665f3336ad':
2009-10-09 01:28:12 -07:00
David Krause
a614b948e1 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-09 01:28:12 -07:00
Robert Greenwalt
6105ea00a8 am 98e0b146: Make PhoneStateListeners not call TelephonyManager
Merge commit '98e0b146b80670b52805b4b210ef5582dad6bb68' into eclair-plus-aosp

* commit '98e0b146b80670b52805b4b210ef5582dad6bb68':
  Make PhoneStateListeners not call TelephonyManager
2009-10-09 01:22:57 -07:00
Robert Greenwalt
2515cf85d5 am 98e0b146: Make PhoneStateListeners not call TelephonyManager
Merge commit '98e0b146b80670b52805b4b210ef5582dad6bb68' into eclair-mr2

* commit '98e0b146b80670b52805b4b210ef5582dad6bb68':
  Make PhoneStateListeners not call TelephonyManager
2009-10-09 01:22:22 -07:00
Robert Greenwalt
98e0b146b8 Make PhoneStateListeners not call TelephonyManager
Since the StatusBarPolicy is run in the System Process and shouldn't therefore call into
the Telephony process we decided to make sure all the needed info was passed along with the
original notifications.

bug: 2173053
2009-10-09 00:54:31 -07:00
Grace Kloba
a1c0506e3f am 1184313c: Setting WebCore cache limit depending on the memory class.
Merge commit '1184313cbea3b34a4596a90be7081551d36f251a' into eclair-mr2

* commit '1184313cbea3b34a4596a90be7081551d36f251a':
  Setting WebCore cache limit depending on the memory class.
2009-10-09 00:10:58 -07:00
Grace Kloba
fbe7f6d5ab am 1184313c: Setting WebCore cache limit depending on the memory class.
Merge commit '1184313cbea3b34a4596a90be7081551d36f251a' into eclair-plus-aosp

* commit '1184313cbea3b34a4596a90be7081551d36f251a':
  Setting WebCore cache limit depending on the memory class.
2009-10-09 00:10:32 -07:00
Grace Kloba
1184313cbe Setting WebCore cache limit depending on the memory class.
Fix http://b/issue?id=2176656
2009-10-08 21:01:49 -07:00
Dan Egnor
371071c195 am e9d8f545: am 6903d5ce: Merge change Iee649a81 into eclair
Merge commit 'e9d8f545bf0ae577733c6aefc0f7cb671f61af5e' into eclair-mr2-plus-aosp

* commit 'e9d8f545bf0ae577733c6aefc0f7cb671f61af5e':
2009-10-08 20:30:42 -07:00
Jeff Sharkey
6815a67c53 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-08 20:30:41 -07:00
Dan Egnor
0051660cea am 6903d5ce: Merge change Iee649a81 into eclair
Merge commit '6903d5cedcffa005818c497f672cf16c2dff619c' into eclair-plus-aosp

* commit '6903d5cedcffa005818c497f672cf16c2dff619c':
  Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
2009-10-08 20:25:10 -07:00
Dan Egnor
e9d8f545bf am 6903d5ce: Merge change Iee649a81 into eclair
Merge commit '6903d5cedcffa005818c497f672cf16c2dff619c' into eclair-mr2

* commit '6903d5cedcffa005818c497f672cf16c2dff619c':
  Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
2009-10-08 20:24:20 -07:00