Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,414 Commits 3 Branches 0 Tags
4bde3b36022af1256150b697f7fe181ff2c16bb9
Commit Graph

10414 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Wilson
4bde3b3602 am c27d5718: (-s ours) am 5648dbb1: Merge change 27159 into eclair 
Merge commit 'c27d57182a5722aba51af700593852b4ab006653'

* commit 'c27d57182a5722aba51af700593852b4ab006653':
  DO NOT MERGE: Cleaning up the PipedStreamTest
 2009-09-28 01:08:06 -07:00
Jesse Wilson
5b5a4394ab am b9b6b17d: am 2d6c325e: API XML changes to accompany dalvik.system deprecation. 
Merge commit 'b9b6b17d73590e07d9fcfa50671bbd6df0f150cf'

* commit 'b9b6b17d73590e07d9fcfa50671bbd6df0f150cf':
  API XML changes to accompany dalvik.system deprecation.
 2009-09-28 01:07:44 -07:00
Jeff Sharkey
b18e90cd46 am 67e40117: am 05701839: Remove query parameters for delaying group updates. 
Merge commit '67e40117f7f79163469a7702de50c0123bf677d2'

* commit '67e40117f7f79163469a7702de50c0123bf677d2':
  Remove query parameters for delaying group updates.
 2009-09-28 01:07:33 -07:00
Dima Zavin
3489bbbf7c am 434462f0: am ed5ecdba: egl: temporarily also include eglTerminate->eglInitialize hack for 8k 
Merge commit '434462f0c95b5f828ee9ab5e2fd86a73dd2c6fe9'

* commit '434462f0c95b5f828ee9ab5e2fd86a73dd2c6fe9':
  egl: temporarily also include eglTerminate->eglInitialize hack for 8k
 2009-09-28 01:07:20 -07:00
Jason Sams
7bcb137926 am abd8c8ac: am f075b4e7: Fix fountain crash. 
Merge commit 'abd8c8ac937e78733390142e73352c8397cfb00a'

* commit 'abd8c8ac937e78733390142e73352c8397cfb00a':
  Fix fountain crash.
 2009-09-28 01:06:25 -07:00
Jeff Hamilton
648b0b3778 am 3b5fa275: am a6c402fb: Merge change 27212 into eclair 
Merge commit '3b5fa2755229cf1f5c4f8cf35da9c47a24ca0a32'

* commit '3b5fa2755229cf1f5c4f8cf35da9c47a24ca0a32':
  Fix the build.
 2009-09-28 01:05:22 -07:00
Jack Palevich
3cc4f8f7a6 am ee61acdc: am 8b854e0d: Merge change 27211 into eclair 
Merge commit 'ee61acdc53ad5ae4e61a272ac66405be5c2b72a3'

* commit 'ee61acdc53ad5ae4e61a272ac66405be5c2b72a3':
  Fix build.
 2009-09-28 01:05:14 -07:00
Jack Palevich
bebf50cba7 am b44d9e15: am 056ade1b: Merge change 27203 into eclair 
Merge commit 'b44d9e150a9578a1e35362119af308b674e6f5b7'

* commit 'b44d9e150a9578a1e35362119af308b674e6f5b7':
  Tighten up sample code.
 2009-09-27 15:43:43 -07:00
Jack Palevich
5528fbea9c am a46c138a: am 07e0dce4: Merge change 27202 into eclair 
Merge commit 'a46c138ab37e141f195d449f453dda8bd1df0947'

* commit 'a46c138ab37e141f195d449f453dda8bd1df0947':
  Check for failure to create EGL surfaces and contexts.
 2009-09-27 15:43:35 -07:00
Scott Main
6a48fccce2 am dd964993: am f80e7d9c: am 60d8b780: Merge change 27064 into donut 
Merge commit 'dd9649931fa2ce3a9fa469438cd81fc748355be0'

* commit 'dd9649931fa2ce3a9fa469438cd81fc748355be0':
  docs only.
 2009-09-27 15:43:20 -07:00
Robert Greenwalt
be5e37d579 am fc6cd596: am a16ca5ec: Merge change 27141 into eclair 
Merge commit 'fc6cd59650d9f3f649dcdf5f5e23b3e089d7d5b9'

* commit 'fc6cd59650d9f3f649dcdf5f5e23b3e089d7d5b9':
  Fix ConnectivityManager's handling of apn switch.
 2009-09-27 15:43:08 -07:00
Dianne Hackborn
7fd48b2001 am e42ed5fb: am 05eeeace: Merge change 27178 into eclair 
Merge commit 'e42ed5fb1b20fca1468ac5e704d4e49c95ffee21'

* commit 'e42ed5fb1b20fca1468ac5e704d4e49c95ffee21':
  Fix issue #2136448: googleapps crashes while adding 2nd gmail account
 2009-09-27 15:42:58 -07:00
Jason Sams
98bede00fe am 5b2acbfc: am 0c103af3: Merge change 27171 into eclair 
Merge commit '5b2acbfcee2e424583ed69de5a94e6582b096d59'

* commit '5b2acbfcee2e424583ed69de5a94e6582b096d59':
  Fix remaining object leaks.  Change FountainView to tear down the rsContext and recreate on rotation to test teardown.
 2009-09-27 15:42:40 -07:00
Yu Shan Emily Lau
0a63934d97 am 20f8fcd9: am 7756cbee: Merge change 27073 into eclair 
Merge commit '20f8fcd9fe2a1c034113431ecbab8aa03114bb63'

* commit '20f8fcd9fe2a1c034113431ecbab8aa03114bb63':
  Removed the device type checking
 2009-09-27 15:42:30 -07:00
Jack Palevich
7ac0e87f9b am b1d9ee62: am 2a5eea30: Merge change 27168 into eclair 
Merge commit 'b1d9ee626694e06196b5fc7f7ea5eb99ea998eb0'

* commit 'b1d9ee626694e06196b5fc7f7ea5eb99ea998eb0':
  Use EGLUtils to simplify choosing a configuration.
 2009-09-27 15:42:23 -07:00
Jason Sams
c1ee427de0 am b4da1161: am aafc7b54: Merge change 27169 into eclair 
Merge commit 'b4da1161f4a4170315a2e8332d95ceea2eb7bef0'

* commit 'b4da1161f4a4170315a2e8332d95ceea2eb7bef0':
  Improved object lifecycle tracking and fix leaks.
 2009-09-27 15:42:16 -07:00
Neel Parekh
d42a612ea9 am 1f395a21: am 6ecacd40: Center name when no status. Also shows the status if exists (not actually hooked up yet though). 
Merge commit '1f395a210acfa4b9d368bca4f4709dd7686cf669'

* commit '1f395a210acfa4b9d368bca4f4709dd7686cf669':
  Center name when no status.
 2009-09-27 15:42:00 -07:00
Dianne Hackborn
2ecde7d9ca am 7bae17c6: am 48c84052: Merge change 27162 into eclair 
Merge commit '7bae17c6de08a1a6416f7d0e8da8b31c0c31ff9b'

* commit '7bae17c6de08a1a6416f7d0e8da8b31c0c31ff9b':
  Fix Activity.overridePendingTransition().
 2009-09-27 15:41:39 -07:00
Neel Parekh
fdb8661c33 am 9a9b97d3: am 35468254: Merge change 26720 into eclair 
Merge commit '9a9b97d3a98cff6f2a9a5bd590c113c79f3fc7c9'

* commit '9a9b97d3a98cff6f2a9a5bd590c113c79f3fc7c9':
  Allow us to set the contact uri without setting the fast track's uri
 2009-09-27 15:41:28 -07:00
Fred Quintana
1a85cf6d77 am abd4d965: am 6ecaff15: add a optional String to the key of notifications to allow users to scope them 
Merge commit 'abd4d965db17d8e77119da5246d5a9c367ae9c58'

* commit 'abd4d965db17d8e77119da5246d5a9c367ae9c58':
  add a optional String to the key of notifications to allow users
 2009-09-27 15:41:20 -07:00
Evan Millar
0c3e1ec152 am c724d2cd: am ed7f0955: Merge change 27150 into eclair 
Merge commit 'c724d2cd198b6ef3226ed415aac349a925a85d9d'

* commit 'c724d2cd198b6ef3226ed415aac349a925a85d9d':
  Fix FasttrackBadgeWidget pressed state.
 2009-09-27 15:40:35 -07:00
Jason Sams
558f90b95e am 027c95d5: am f37b258c: Merge change 27146 into eclair 
Merge commit '027c95d5552a1e5d34114fcdde3ff03a3ced3556'

* commit '027c95d5552a1e5d34114fcdde3ff03a3ced3556':
  Reduce debugging spew and add props to selectivly re-enable it.
 2009-09-27 15:40:22 -07:00
Scott Main
03226e8612 am 1ac0247e: am ba14fff7: am 12242678: docs only. fix broken links 
Merge commit '1ac0247e8b3ee92637d88f9a6186414442e2e4e8'

* commit '1ac0247e8b3ee92637d88f9a6186414442e2e4e8':
  docs only.
 2009-09-27 15:40:15 -07:00
Jason Sams
f66baf4726 am f6252635: am 2896f7d6: Merge change 27137 into eclair 
Merge commit 'f6252635870e83abe461943ac293a8b0b1453998'

* commit 'f6252635870e83abe461943ac293a8b0b1453998':
  Improve renderscript context teardown.  Track object in the system and then force their cleanup by releasing all user references once destroy context is called.  Java layer will no longer send destroy notifications for objects garbage collected once a context is destroyed.
 2009-09-27 15:39:42 -07:00
John Wang
a4782d907c am 53e501cf: am fb2b04b7: Unhide NETWORK_TYPE_XXX. 
Merge commit '53e501cfb3b26edd65a91ff404283de67e0bcbc1'

* commit '53e501cfb3b26edd65a91ff404283de67e0bcbc1':
  Unhide NETWORK_TYPE_XXX.
 2009-09-27 15:39:30 -07:00
Karl Rosaen
9042d5159e am 08fc1b50: am 0cb901c4: Merge change 27076 into eclair 
Merge commit '08fc1b507c388606cf6dcb4523c8cb3766415deb'

* commit '08fc1b507c388606cf6dcb4523c8cb3766415deb':
  Optimize rotary selector widget by using bitmaps instead of drawables.
 2009-09-27 15:39:18 -07:00
Wu-cheng Li
04a62d25c5 am 3af65a07: am 8de57d8f: Add camera parameter key constants and documentation. 
Merge commit '3af65a075ab2c1f48da846b324a220056e5239de'

* commit '3af65a075ab2c1f48da846b324a220056e5239de':
  Add camera parameter key constants and documentation.
 2009-09-27 15:38:59 -07:00
Xavier Ducrohet
d64f65997d am d7168c6b: am bd5219f5: Merge change 27106 into eclair 
Merge commit 'd7168c6b12b325be5d91ddee0c1b6de092727ec1'

* commit 'd7168c6b12b325be5d91ddee0c1b6de092727ec1':
  Use reflection to figure out a readable string from install error code.
 2009-09-27 15:38:39 -07:00
Daisuke Miyakawa
a94e377c1e am d4e21df9: am 3ed05574: Merge change 27077 into eclair 
Merge commit 'd4e21df96109c26a00116103567af22ff1e8f8a6'

* commit 'd4e21df96109c26a00116103567af22ff1e8f8a6':
  Two changes toward vCard composer.
 2009-09-27 15:38:12 -07:00
Daniel Sandler
d33205c570 am 032b3bc9: am 228067ac: Merge change 27116 into eclair 
Merge commit '032b3bc9a94fe7f490cb4b2e7bca3a7167465cfc'

* commit '032b3bc9a94fe7f490cb4b2e7bca3a7167465cfc':
  Fix http://b/2131173 (gaps between Gallery tiles).
 2009-09-27 15:38:02 -07:00
Grace Kloba
2aa3313b6c am be3abd73: am 0f5fd893: Merge change 27052 into eclair 
Merge commit 'be3abd73346206d7e3aeaae54a9bcace3b5f8ee8'

* commit 'be3abd73346206d7e3aeaae54a9bcace3b5f8ee8':
  If WebCore doesn't response touch down in time, don't
 2009-09-27 15:37:39 -07:00
johnwang
90e09bd784 am f7760124: am 9c118c80: Update CID in NeighboringCellInfo 
Merge commit 'f7760124264099a9c4b0aa6e03392816ceb81c7f'

* commit 'f7760124264099a9c4b0aa6e03392816ceb81c7f':
  Update CID in NeighboringCellInfo
 2009-09-27 15:37:32 -07:00
David 'Digit' Turner
4e86332651 am 6c52fdb6: am a0cad2f5: Merge change 27078 into eclair 
Merge commit '6c52fdb684740a7ee86a743cacc701d9db24e8da'

* commit '6c52fdb684740a7ee86a743cacc701d9db24e8da':
  Fix generic build boot sequence.
 2009-09-27 15:36:24 -07:00
Jesse Wilson
c27d57182a am 5648dbb1: Merge change 27159 into eclair 
Merge commit '5648dbb1dabc0231fe953ad45916c067c79986c8' into eclair-plus-aosp

* commit '5648dbb1dabc0231fe953ad45916c067c79986c8':
  DO NOT MERGE: Cleaning up the PipedStreamTest
 2009-09-26 11:21:16 -07:00
Android (Google) Code Review
5648dbb1da Merge change 27159 into eclair 
* changes:
  DO NOT MERGE: Cleaning up the PipedStreamTest
 2009-09-26 14:12:23 -04:00
Jesse Wilson
b9b6b17d73 am 2d6c325e: API XML changes to accompany dalvik.system deprecation. 
Merge commit '2d6c325e780143a7725aaa32af11f8a4658f7cd3' into eclair-plus-aosp

* commit '2d6c325e780143a7725aaa32af11f8a4658f7cd3':
  API XML changes to accompany dalvik.system deprecation.
 2009-09-26 10:48:09 -07:00
Jesse Wilson
e78fcbac04 DO NOT MERGE: Cleaning up the PipedStreamTest 2009-09-26 09:28:17 -07:00
Jesse Wilson
2d6c325e78 API XML changes to accompany dalvik.system deprecation. 
See https://android-git.corp.google.com/g/26570
 2009-09-26 09:09:10 -07:00
Jeff Sharkey
67e40117f7 am 05701839: Remove query parameters for delaying group updates. 
Merge commit '057018399c7ce6d3893ee5fc622f1592f51773b9' into eclair-plus-aosp

* commit '057018399c7ce6d3893ee5fc622f1592f51773b9':
  Remove query parameters for delaying group updates.
 2009-09-26 05:35:15 -07:00
Jeff Sharkey
057018399c Remove query parameters for delaying group updates. 
Callers should instead use applyBatch(), which now delays
any visible updates until the transation finishes.  This
partially fixes http://b/2075275
 2009-09-26 02:14:43 -07:00
Dima Zavin
434462f0c9 am ed5ecdba: egl: temporarily also include eglTerminate->eglInitialize hack for 8k 
Merge commit 'ed5ecdba36648973be3033a045e2ece8bf039e4a' into eclair-plus-aosp

* commit 'ed5ecdba36648973be3033a045e2ece8bf039e4a':
  egl: temporarily also include eglTerminate->eglInitialize hack for 8k
 2009-09-26 02:00:13 -07:00
Dima Zavin
ed5ecdba36 egl: temporarily also include eglTerminate->eglInitialize hack for 8k 
Change-Id: Id5c51e54e733b24e5d5d5de0dcca84ac53afd3a9
Signed-off-by: Dima Zavin <dima@android.com>
 2009-09-26 01:00:49 -07:00
Jason Sams
abd8c8ac93 am f075b4e7: Fix fountain crash. 
Merge commit 'f075b4e713c4e10e4cea12c856fcf4aaab9c29d4' into eclair-plus-aosp

* commit 'f075b4e713c4e10e4cea12c856fcf4aaab9c29d4':
  Fix fountain crash.
 2009-09-25 20:38:01 -07:00
Jason Sams
f075b4e713 Fix fountain crash. 2009-09-25 20:24:54 -07:00
Jeff Hamilton
3b5fa27552 am a6c402fb: Merge change 27212 into eclair 
Merge commit 'a6c402fb0ec4298413e1d37c53f0524ea3325854' into eclair-plus-aosp

* commit 'a6c402fb0ec4298413e1d37c53f0524ea3325854':
  Fix the build.
 2009-09-25 20:04:25 -07:00
Jack Palevich
ee61acdc53 am 8b854e0d: Merge change 27211 into eclair 
Merge commit '8b854e0d59512004028f96a93016e614c7df478a' into eclair-plus-aosp

* commit '8b854e0d59512004028f96a93016e614c7df478a':
  Fix build.
 2009-09-25 20:04:20 -07:00
Android (Google) Code Review
a6c402fb0e Merge change 27212 into eclair 
* changes:
  Fix the build.
 2009-09-25 22:57:07 -04:00
Jeff Hamilton
a8370e3fdc Fix the build. 
Change-Id: Ie4b61f8e8dde864c4d99b8723cd5ff290a373279
 2009-09-25 21:56:25 -05:00
Android (Google) Code Review
8b854e0d59 Merge change 27211 into eclair 
* changes:
  Fix build.
 2009-09-25 22:55:31 -04:00
Jack Palevich
d7de5ffb30 Fix build. 2009-09-25 19:55:07 -07:00