Commit Graph

9623 Commits

Author SHA1 Message Date
Wu-cheng Li
16d8f10ebf am 4cb04c46: Use image rect information to display zoomed picture.
Merge commit '4cb04c4654e9718a73b378e7b9962dee454efa8d' into eclair-mr2

* commit '4cb04c4654e9718a73b378e7b9962dee454efa8d':
  Use image rect information to display zoomed picture.
2009-10-29 19:26:04 -07:00
Eric Fischer
5cecf74138 am 38a9becf: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '38a9becfdd23e582571f624b624680cc5938d423' into eclair-mr2

* commit '38a9becfdd23e582571f624b624680cc5938d423':
  Import revised translations.  DO NOT MERGE
2009-10-29 19:23:51 -07:00
Marco Nelissen
c81e43c8ee resolved conflicts for merge 31957f1b to eclair-mr2 2009-10-29 18:04:17 -07:00
Android (Google) Code Review
758b5b25f0 Merge change I35155c1d into eclair-mr2
* changes:
  divide mRestoredScale before use
2009-10-29 16:59:39 -04:00
Marco Nelissen
a89a059ea7 am 04104665: Merge change I911458a0 into eclair
Merge commit '04104665271248719cb3659e42938fa4bec0261e' into eclair-mr2

* commit '04104665271248719cb3659e42938fa4bec0261e':
  Fix x offset for boxed textures
2009-10-29 13:46:07 -07:00
Suchi Amalapurapu
18eedbacac am a47a1e77: Merge change Ic03d28b9 into eclair
Merge commit 'a47a1e77a4dc9510187f57d5cdf12f5ecf6b3ab0' into eclair-mr2

* commit 'a47a1e77a4dc9510187f57d5cdf12f5ecf6b3ab0':
  Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces
2009-10-29 13:45:05 -07:00
Fred Quintana
0fca5b45ff am 5e5eb393: Merge change Id572ffc7 into eclair
Merge commit '5e5eb393729630800079206498f283de8f02f3a7' into eclair-mr2

* commit '5e5eb393729630800079206498f283de8f02f3a7':
  don't throw an exception when we can't find a pending sync operation in the database
2009-10-29 13:44:08 -07:00
Mathias Agopian
2b770bbe46 am 85ade33e: fix [2071412] work around mdp 32-bits fade limitation
Merge commit '85ade33edcc7d9be462ad7b8455d27f6654aca5e' into eclair-mr2

* commit '85ade33edcc7d9be462ad7b8455d27f6654aca5e':
  fix [2071412] work around mdp 32-bits fade limitation
2009-10-29 13:43:26 -07:00
Christopher Tate
72c0d29379 am 763ccae7: (-s ours) Merge change I8e7f5f07 into eclair
Merge commit '763ccae7d734cc7e55772936dc3f101a2bf453d4' into eclair-mr2

* commit '763ccae7d734cc7e55772936dc3f101a2bf453d4':
  DO NOT MERGE: Fix loss of focus after wakeup into incall screen
2009-10-29 13:41:28 -07:00
Scott Main
e7672d0041 am 25aa87b2: am d14f1bd7: Merge change Iacb6e122 into eclair-sdk
Merge commit '25aa87b2fdd065637cc87cb4b3e58b828aa29120' into eclair-mr2

* commit '25aa87b2fdd065637cc87cb4b3e58b828aa29120':
  docs: add 2.0 video to developer site feature videos
2009-10-29 13:41:06 -07:00
Dirk Dougherty
9ac642a924 am 340fbc36: am 5a4d6696: Merge change Ib80db923 into eclair-sdk
Merge commit '340fbc36fb5ded7819d09d55117917b9a6361fd4' into eclair-mr2

* commit '340fbc36fb5ded7819d09d55117917b9a6361fd4':
  doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
2009-10-29 13:40:38 -07:00
Android (Google) Code Review
9dba1f9280 Merge change Ib482ce88 into eclair-mr2
* changes:
  Revive support for video encoding in OMXCodec.
2009-10-29 16:20:43 -04:00
Cary Clark
35155c1d8b divide mRestoredScale before use
Also add debugging to help find incorrect width bug (see bug)

fixes http://b/issue?id=2218767
2009-10-29 15:34:00 -04:00
Andreas Huber
b482ce8837 Revive support for video encoding in OMXCodec. 2009-10-29 12:02:48 -07:00
Andy McFadden
66e0620503 Another gcc 4.0.3 workaround.
Temporarily make a function public that doesn't need to be.  When
host gcc-4.0.3 is gone from the build servers we can undo this.
2009-10-29 10:20:44 -07:00
Leon Scroggins
5de6389f22 DO NOT MERGE. Send a message when the picture changes and find is up to search again.
Fixes http://b/issue?id=2222706

Requires a change in external/webkit.  Not merging because the
change in webkit should be altered slightly.
2009-10-29 12:52:11 -04:00
Android (Google) Code Review
9d73409e76 Merge change Ic5e3d73f into eclair-mr2
* changes:
  LOG_ASSERT needs a message.
2009-10-29 11:09:53 -04:00
Android (Google) Code Review
3fc145aafd Merge change Ie8672184 into eclair-mr2
* changes:
  Add error code column to SMS
2009-10-29 11:07:15 -04:00
Patrick Scott
c5e3d73f92 LOG_ASSERT needs a message.
This fails to build when asserts are turned on.
2009-10-29 08:31:36 -04:00
Eric Fischer
8071b14680 am fb872d1a: Merge change Id4d04def into eclair
Merge commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df' into eclair-mr2

* commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df':
  Fix a race that kept the locale picker from working under heavy CPU load.
2009-10-29 01:28:53 -07:00
Jean-Michel Trivi
ee507eb560 am 89889733: Merge change I4e83a76a into eclair
Merge commit '898897338dfd62a268a89fb55ee900a9bd5a683f' into eclair-mr2

* commit '898897338dfd62a268a89fb55ee900a9bd5a683f':
  Fix bug 2201417. Whenever the System setting that indicates
2009-10-29 01:28:06 -07:00
Mike Lockwood
c867958eb6 am d376d240: Merge change I081f08c1 into eclair
Merge commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550' into eclair-mr2

* commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550':
  A better solution for ignoring user activity while the screen is animating off.
2009-10-29 01:27:40 -07:00
Mathias Agopian
a2151b2b98 am 7bde36e6: added GL test for textured lines
Merge commit '7bde36e64e66c81f0150d0372e1357a31f4ec704' into eclair-mr2

* commit '7bde36e64e66c81f0150d0372e1357a31f4ec704':
  added GL test for textured lines
2009-10-29 01:27:18 -07:00
Mathias Agopian
893cb4da10 am 73e17015: Merge change I8d2de438 into eclair
Merge commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694' into eclair-mr2

* commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694':
  fix [2143798] Need to figure out how to do video
2009-10-29 01:26:48 -07:00
Dave Sparks
b07d14c26e am 8321bdf4: Merge change I95529db1 into eclair
Merge commit '8321bdf4dd85b81224d84b0d7a2f53218bf1a250' into eclair-mr2

* commit '8321bdf4dd85b81224d84b0d7a2f53218bf1a250':
  Add Free Flight ringtone to source tree.
2009-10-29 01:25:17 -07:00
Scott Main
5c24774de4 am 42522449: am 675eb31d: Merge change I1a010c12 into eclair-sdk
Merge commit '4252244939089ce0b055456335071bb7f2c0d1c3' into eclair-mr2

* commit '4252244939089ce0b055456335071bb7f2c0d1c3':
  docs: fix broken link for download page.
2009-10-29 01:24:47 -07:00
Ying Wang
102767cd3b am d85c4b34: Merge change Idb328ab7 into eclair
Merge commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35' into eclair-mr2

* commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35':
  Explicitly specify that online-sdk depends on framework-res.
2009-10-29 01:23:58 -07:00
Guang Zhu
0b12dc3aca am aebcaec3: Merge change I2e90d640 into eclair
Merge commit 'aebcaec3c171f636a24051ce85ded2f86b09461b' into eclair-mr2

* commit 'aebcaec3c171f636a24051ce85ded2f86b09461b':
  Remove the activity restart between urls.
2009-10-29 01:23:33 -07:00
Jason Sams
21e799ed62 am e9e50b57: Merge change I7136220b into eclair
Merge commit 'e9e50b57e03cfea2d0b9b540e5a2baa36e2d60e8' into eclair-mr2

* commit 'e9e50b57e03cfea2d0b9b540e5a2baa36e2d60e8':
  Fix egl cleanup code on context teardown.
2009-10-29 01:22:47 -07:00
Mike Lockwood
f634f49228 am 5ef89808: Merge change I9c242127 into eclair
Merge commit '5ef898080c1b8b596531c938eae87b3c35331ac2' into eclair-mr2

* commit '5ef898080c1b8b596531c938eae87b3c35331ac2':
  PowerManagerService: Animate LCD backlight changes due to autobrightness support.
2009-10-29 01:21:46 -07:00
Dave Sparks
6373349836 am 98de26e0: Merge change I8cc42c52 into eclair
Merge commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6' into eclair-mr2

* commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6':
  Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
2009-10-29 01:21:17 -07:00
Mike Reed
a01dc0fc59 am 2dfaa698: (-s ours) Merge change I882d2eb8 into eclair
Merge commit '2dfaa698012b36d83e342b5ef1e88734dfbcac80' into eclair-mr2

* commit '2dfaa698012b36d83e342b5ef1e88734dfbcac80':
  do not merge
2009-10-29 01:20:26 -07:00
Dianne Hackborn
40946aa201 am 1f668fff: Merge change Idb13ed9a into eclair
Merge commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441' into eclair-mr2

* commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441':
  Add SDK version for MR1.
2009-10-29 01:20:01 -07:00
Wu-cheng Li
4cb04c4654 Use image rect information to display zoomed picture. 2009-10-29 13:20:26 +08:00
Eric Fischer
38a9becfdd Import revised translations. DO NOT MERGE 2009-10-28 21:16:52 -07:00
Daisuke Miyakawa
f5633bc7e2 Fix test breakage in testNickNameV21().
Internal issue number: 2079082
2009-10-29 12:24:26 +09:00
Daisuke Miyakawa
d95a02c2a6 Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
Also add method String formatNumber(String source, int defaultFormattingType) with @hide tag.

Internal Issue number: 2217362
2009-10-29 11:01:07 +09:00
Android (Google) Code Review
3c828e24a9 Merge change I9195a354 into eclair-mr2
* changes:
  Add partial support of Android-specific properties.
2009-10-28 21:54:29 -04:00
Daisuke Miyakawa
837cba33c5 Add partial support of Android-specific properties.
In the near future, all the values which cannot be converted to
vCard property is expressed as "X-ANDROID-CUSTOM" property + MIME_TYPE.

Example (Nick name):
X-ANDROID-CUSTOM:vnd.android.cursor.item/nickname;Nicky;;;;;;;;;;;;;

All the data are stored ordered by its column name ("data1" - "data15").
Currently the code assumes the max num is 15.

Internal Issue number: 2079082
2009-10-29 09:16:31 +09:00
Fred Quintana
31957f1bad - add javadoc for the account manager
- add some checks to the AccountManagerService to keep it from crashing when a null is passed in
- cleaned up the API a bit
2009-10-28 16:29:21 -07:00
Android (Google) Code Review
0410466527 Merge change I911458a0 into eclair
* changes:
  Fix x offset for boxed textures
2009-10-28 19:02:24 -04:00
Dan Egnor
952402704a Instead of a raw AIDL interface, give DropBox a Java
interface (android.os.DropBox); move the Binder interface
behind the scenes.  Make DropBoxEntry into DropBox.Entry.
Make it possible to get a dropbox from an (Application)Context
with the usual getSystemService(DROPBOX_SERVICE) type thing.
Update the tests accordingly.
2009-10-28 15:49:11 -07:00
Android (Google) Code Review
a47a1e77a4 Merge change Ic03d28b9 into eclair
* changes:
  Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces again this flag gets set no matter what since the keyguard window is always present in the list of tokens and this hides the window which would have become visible since the keyguard just got dismissed. This causes unnecessary focus changes due to changes in visibility of current window.
2009-10-28 18:28:42 -04:00
Marco Nelissen
911458a081 Fix x offset for boxed textures 2009-10-28 15:10:56 -07:00
Android (Google) Code Review
5e5eb39372 Merge change Id572ffc7 into eclair
* changes:
  don't throw an exception when we can't find a pending sync operation in the database
2009-10-28 18:05:09 -04:00
Fred Quintana
cb41faa285 don't throw an exception when we can't find a pending sync operation in the database 2009-10-28 14:52:33 -07:00
Mathias Agopian
85ade33edc fix [2071412] work around mdp 32-bits fade limitation
in the case where we fade a 32-bits surface (ie: GL_MODULATE w/ a,a,a,a + blending),
we first make a copy of the background into a RGB buffer, then we blend the 32-bits
surface as usual (without the alpha component), and finally blend the copy of
the background on top with 1-a. This uses a lot of bandwidth, but no CPU time.
2009-10-28 14:49:44 -07:00
Suchi Amalapurapu
c03d28b9e9 Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces
again this flag gets set no matter what since the keyguard window is always present in the list of tokens and this hides the window which would
have become visible since the keyguard just got dismissed.
This causes unnecessary focus changes due to changes in visibility of current window.

This will resolve issues related to current focus and time outs when dispatching key events.
2009-10-28 14:47:45 -07:00
Tom Taylor
e867218433 Add error code column to SMS
Also add code to save an error code in the DB.
2009-10-28 14:38:44 -07:00
Android (Google) Code Review
10d32a338d Merge change I16dc1411 into eclair-mr2
* changes:
  add boundary patch
2009-10-28 15:37:34 -04:00