drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,038 Commits 1 Branch 0 Tags
Commit Graph

13038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andy McFadden
cad9a4b046 am 66e06205: Another gcc 4.0.3 workaround. 
Merge commit '66e06205030cfc72f9aeeac57acfd6cbff0c1b8a' into eclair-mr2-plus-aosp

* commit '66e06205030cfc72f9aeeac57acfd6cbff0c1b8a':
  Another gcc 4.0.3 workaround.
 2009-10-29 13:20:46 -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
Android (Google) Code Review
4388b98845 Merge change Idc4c7714 into eclair 
* changes:
  Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
 2009-10-29 16:18:35 -04:00
Costin Manolache
88a211b148 Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes. 2009-10-29 13:14:47 -07:00
Android (Google) Code Review
ec1f1e3df1 Merge change Ieab4c75b into eclair 
* changes:
  Fix type in Java enums.  Not currently used, easier to fix now than when apps are using it.
 2009-10-29 15:48:51 -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
Android (Google) Code Review
b5c05516ba Merge change I3b7d5cbe into eclair 
* changes:
  Copy the selection args when creating a CPO since callers often reuse the passed in array.
 2009-10-29 15:11:40 -04:00
Android (Google) Code Review
8e312e8160 Merge change Ia5109a87 into eclair 
* changes:
  process: Add debug code to log process group transitions
 2009-10-29 15:02:53 -04:00
Andreas Huber
b482ce8837 Revive support for video encoding in OMXCodec. 2009-10-29 12:02:48 -07:00
San Mehat
a5109a878e process: Add debug code to log process group transitions 
Signed-off-by: San Mehat <san@google.com>
 2009-10-29 11:50:43 -07:00
Leon Scroggins
b7b45ed4aa 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.

Cherry pick of a change to mr2
 2009-10-29 13:27:51 -04: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
e7ab7448be am 1f7253c3: (-s ours) am 5de6389f: DO NOT MERGE. Send a message when the picture changes and find is up to search again. 
Merge commit '1f7253c3c27ad604a9b6ad6d1b0a88f4d694a81b'

* commit '1f7253c3c27ad604a9b6ad6d1b0a88f4d694a81b':
  DO NOT MERGE. Send a message when the picture changes and find is up to search again.
 2009-10-29 10:18:17 -07:00
Leon Scroggins
1f7253c3c2 am 5de6389f: DO NOT MERGE. Send a message when the picture changes and find is up to search again. 
Merge commit '5de6389f2252cb6e39918e21f80a08918e0c2c02' into eclair-mr2-plus-aosp

* commit '5de6389f2252cb6e39918e21f80a08918e0c2c02':
  DO NOT MERGE. Send a message when the picture changes and find is up to search again.
 2009-10-29 10:10:00 -07:00
Android (Google) Code Review
b575e4dffe Merge change I4a943184 into eclair 
* changes:
  Avoid trying to throw multiple exceptions at once.
 2009-10-29 13:02:53 -04: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
Patrick Scott
590dfffe1a am 9ad42745: am 9d73409e: Merge change Ic5e3d73f into eclair-mr2 
Merge commit '9ad4274588374df796f7fb9f35d44476fc50c8de'

* commit '9ad4274588374df796f7fb9f35d44476fc50c8de':
  LOG_ASSERT needs a message.
 2009-10-29 08:40:25 -07:00
Tom Taylor
cf90c4a9fa am 6dd8a935: am 3fc145aa: Merge change Ie8672184 into eclair-mr2 
Merge commit '6dd8a9351b651c8e85271660fcb2db80328a7b94'

* commit '6dd8a9351b651c8e85271660fcb2db80328a7b94':
  Add error code column to SMS
 2009-10-29 08:40:05 -07:00
Patrick Scott
9ad4274588 am 9d73409e: Merge change Ic5e3d73f into eclair-mr2 
Merge commit '9d73409e76000f06a7ee3395241154a029152483' into eclair-mr2-plus-aosp

* commit '9d73409e76000f06a7ee3395241154a029152483':
  LOG_ASSERT needs a message.
 2009-10-29 08:16:44 -07:00
Tom Taylor
6dd8a9351b am 3fc145aa: Merge change Ie8672184 into eclair-mr2 
Merge commit '3fc145aafd4e04875ab3b67fed3429db30e15e48' into eclair-mr2-plus-aosp

* commit '3fc145aafd4e04875ab3b67fed3429db30e15e48':
  Add error code column to SMS
 2009-10-29 08:16:25 -07: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
d01fd60400 am 25510e07: am 8071b146: am fb872d1a: Merge change Id4d04def into eclair 
Merge commit '25510e077766cf023dd0adb9c84d6d5f82cc01bc'

* commit '25510e077766cf023dd0adb9c84d6d5f82cc01bc':
  Fix a race that kept the locale picker from working under heavy CPU load.
 2009-10-29 02:06:26 -07:00
Jean-Michel Trivi
cd54683ef9 am 5fc26f60: am ee507eb5: am 89889733: Merge change I4e83a76a into eclair 
Merge commit '5fc26f609aaf0a878bd821e9d8df96be025fe2f8'

* commit '5fc26f609aaf0a878bd821e9d8df96be025fe2f8':
  Fix bug 2201417. Whenever the System setting that indicates
 2009-10-29 02:06:08 -07:00
Mike Lockwood
3f084a8ac6 am a41ff4b7: am c867958e: am d376d240: Merge change I081f08c1 into eclair 
Merge commit 'a41ff4b7c2b68aa5d651bcecfce9fc9621c145cb'

* commit 'a41ff4b7c2b68aa5d651bcecfce9fc9621c145cb':
  A better solution for ignoring user activity while the screen is animating off.
 2009-10-29 02:05:50 -07:00
Mathias Agopian
24e2cdcece am 2eca23d6: am a2151b2b: am 7bde36e6: added GL test for textured lines 
Merge commit '2eca23d690379911a102729eecd35412d0c8be63'

* commit '2eca23d690379911a102729eecd35412d0c8be63':
  added GL test for textured lines
 2009-10-29 02:05:33 -07:00
Mathias Agopian
ea138a5f83 am 64d3f44c: am 893cb4da: am 73e17015: Merge change I8d2de438 into eclair 
Merge commit '64d3f44c7bf5a6e80be419df5850ef60fec216b5'

* commit '64d3f44c7bf5a6e80be419df5850ef60fec216b5':
  fix [2143798] Need to figure out how to do video
 2009-10-29 02:05:15 -07:00
Dave Sparks
d16a033e14 am 0200ec3e: am b07d14c2: am 8321bdf4: Merge change I95529db1 into eclair 
Merge commit '0200ec3eb4c9c11cc8f9e3db5a1a51f5db840524'

* commit '0200ec3eb4c9c11cc8f9e3db5a1a51f5db840524':
  Add Free Flight ringtone to source tree.
 2009-10-29 02:04:55 -07:00
Scott Main
3ebe5044aa am cc9d066b: am 5c24774d: am 42522449: am 675eb31d: Merge change I1a010c12 into eclair-sdk 
Merge commit 'cc9d066bf3d2bad6be5f628caa8b87158e56e246'

* commit 'cc9d066bf3d2bad6be5f628caa8b87158e56e246':
  docs: fix broken link for download page.
 2009-10-29 02:04:35 -07:00
Ying Wang
87c72717ee am 69e73d01: am 102767cd: am d85c4b34: Merge change Idb328ab7 into eclair 
Merge commit '69e73d01e5e883c84422096fb078eced8bb98b68'

* commit '69e73d01e5e883c84422096fb078eced8bb98b68':
  Explicitly specify that online-sdk depends on framework-res.
 2009-10-29 02:04:17 -07:00
Guang Zhu
efdccdf602 am dfc54a44: am 0b12dc3a: am aebcaec3: Merge change I2e90d640 into eclair 
Merge commit 'dfc54a44123f32d6b44bdbce54c155d9135baddc'

* commit 'dfc54a44123f32d6b44bdbce54c155d9135baddc':
  Remove the activity restart between urls.
 2009-10-29 02:03:57 -07:00
Jason Sams
060746b383 am 3c249da7: am 21e799ed: am e9e50b57: Merge change I7136220b into eclair 
Merge commit '3c249da7eaceaffae87657aeb7179ffc4a5e1570'

* commit '3c249da7eaceaffae87657aeb7179ffc4a5e1570':
  Fix egl cleanup code on context teardown.
 2009-10-29 02:03:37 -07:00
Mike Lockwood
0a9416482c am 4f049475: am f634f492: am 5ef89808: Merge change I9c242127 into eclair 
Merge commit '4f049475c739dadeea53b428bf2e445a78ebaec5'

* commit '4f049475c739dadeea53b428bf2e445a78ebaec5':
  PowerManagerService: Animate LCD backlight changes due to autobrightness support.
 2009-10-29 02:03:17 -07:00
Dave Sparks
e1513b14e7 am a628d54d: am 63733498: am 98de26e0: Merge change I8cc42c52 into eclair 
Merge commit 'a628d54d108b365b66934e4b83aac739ee5ad9cc'

* commit 'a628d54d108b365b66934e4b83aac739ee5ad9cc':
  Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
 2009-10-29 02:02:54 -07:00
Mike Reed
1d03be23cf am 9a6cf150: (-s ours) am a01dc0fc: am 2dfaa698: (-s ours) Merge change I882d2eb8 into eclair 
Merge commit '9a6cf150480f97a4d14f64c05a7353bc16b2c5db'

* commit '9a6cf150480f97a4d14f64c05a7353bc16b2c5db':
  do not merge
 2009-10-29 02:02:33 -07:00
Dianne Hackborn
f267b94765 am 9a27909e: am 40946aa2: am 1f668fff: Merge change Idb13ed9a into eclair 
Merge commit '9a27909e754b8b2623bbc82a931c2930c033cbb1'

* commit '9a27909e754b8b2623bbc82a931c2930c033cbb1':
  Add SDK version for MR1.
 2009-10-29 02:02:08 -07:00
Daisuke Miyakawa
8a6219660d am d7185d0b: am f5633bc7: Fix test breakage in testNickNameV21(). 
Merge commit 'd7185d0bd250ff5f006ea94d305539ac7d499977'

* commit 'd7185d0bd250ff5f006ea94d305539ac7d499977':
  Fix test breakage in testNickNameV21().
 2009-10-29 02:01:46 -07:00
Daisuke Miyakawa
3e1cf402b9 am 33728557: am d95a02c2: Fix test breakage in Zaku. Modification to PhoneNumberUtils included. 
Merge commit '33728557540d9033ff396f7a2ddd4fb304fdedcd'

* commit '33728557540d9033ff396f7a2ddd4fb304fdedcd':
  Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
 2009-10-29 02:01:22 -07:00
Daisuke Miyakawa
636d5629c5 am aa06a0e0: am 3c828e24: Merge change I9195a354 into eclair-mr2 
Merge commit 'aa06a0e086d57ad3a0d063dfb5ab2cfb7936e4b4'

* commit 'aa06a0e086d57ad3a0d063dfb5ab2cfb7936e4b4':
  Add partial support of Android-specific properties.
 2009-10-29 02:00:59 -07:00
Dan Egnor
11e3364a6a am 473bbd21: am 95240270: 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 u 
Merge commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff'

* commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff':
  Instead of a raw AIDL interface, give DropBox a Java
 2009-10-29 02:00:36 -07:00
Jean-Baptiste Queru
ff06599203 am c4514c09: merge from open-source master 
Merge commit 'c4514c09124b203bf120889bc42d2bc9532d40ad'

* commit 'c4514c09124b203bf120889bc42d2bc9532d40ad':
  donut snapshot
  donut snapshot
 2009-10-29 02:00:11 -07:00
Eric Fischer
25510e0777 am 8071b146: am fb872d1a: Merge change Id4d04def into eclair 
Merge commit '8071b14680f8081019ac1b995d7c7f09a8aeeba7' into eclair-mr2-plus-aosp

* commit '8071b14680f8081019ac1b995d7c7f09a8aeeba7':
  Fix a race that kept the locale picker from working under heavy CPU load.
 2009-10-29 01:47:34 -07:00