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

10455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
32eb22c03a am c46f886b: am 0faa5c6c: Merge change 27271 into eclair 
Merge commit 'c46f886b63772be33c6e6864475140606a79e126'

* commit 'c46f886b63772be33c6e6864475140606a79e126':
  Only scan windows media files when those codecs are enabled.
 2009-09-28 01:11:59 -07:00
Mike Cleron
8f9571e255 am 6a1f4399: am 954e98e0: Merge change 27267 into eclair 
Merge commit '6a1f43990350421e7a41255dbcbfdf0b86e9b92c'

* commit '6a1f43990350421e7a41255dbcbfdf0b86e9b92c':
  Add official assets for tabs in compatibility mode
 2009-09-28 01:10:50 -07:00
Christopher Tate
cfe771500a am 2d5168f6: am 141e4f1d: Merge change 27177 into eclair 
Merge commit '2d5168f650b1865812b1174ea1c37df9bfda6390'

* commit '2d5168f650b1865812b1174ea1c37df9bfda6390':
  Add auto-brightness mode to the list of backed-up settings
 2009-09-28 01:10:40 -07:00
Dmitri Plotnikov
d14db943d3 am 2a2e6ba8: am 8e55eacc: Changing contact status to Presence-based 
Merge commit '2a2e6ba829e9cb4f27ce40991f9a99090d08ec9e'

* commit '2a2e6ba829e9cb4f27ce40991f9a99090d08ec9e':
  Changing contact status to Presence-based
 2009-09-28 01:10:26 -07:00
Mike Cleron
88146ee5af am 5cf07feb: am db9c3f2e: Merge change 27188 into eclair 
Merge commit '5cf07feb3df89e827324e1204674c4f3629eb27e'

* commit '5cf07feb3df89e827324e1204674c4f3629eb27e':
  Fix 2146581: Make tabs work for donut apps
 2009-09-28 01:10:15 -07:00
Dianne Hackborn
c94126bc99 am 25ff4e8c: am 23976407: Maybe fix issue #2145012: Array bounds exception in touch event processing 
Merge commit '25ff4e8c8111fabf79a922073ccf2873520d03cd'

* commit '25ff4e8c8111fabf79a922073ccf2873520d03cd':
  Maybe fix issue #2145012: Array bounds exception in touch event processing
 2009-09-28 01:09:41 -07:00
Dianne Hackborn
b8949398b2 am bc21ba24: am 093f5810: Merge change 27238 into eclair 
Merge commit 'bc21ba2410233b40b21a190b26285a791ac5cc58'

* commit 'bc21ba2410233b40b21a190b26285a791ac5cc58':
  The touch screen is probably a feature.
 2009-09-28 01:09:32 -07:00
Evan Millar
60f203472f am c321ab99: am 3579c4c6: Merge change 27234 into eclair 
Merge commit 'c321ab992d526cde098986d512ce4a051c486607'

* commit 'c321ab992d526cde098986d512ce4a051c486607':
  Fix http://b/issue?id=2106682 (Don't show status if we don't have it).
 2009-09-28 01:09:10 -07:00
Tadashi G. Takaoka
07783cda29 am 0198a9ce: am f06e9984: Merge change 26993 into eclair 
Merge commit '0198a9ce3a66ba8b64f797044b718e7b48e46bcb'

* commit '0198a9ce3a66ba8b64f797044b718e7b48e46bcb':
  Pass provider authority to SyncActivityTooManyDeletes
 2009-09-28 01:08:54 -07:00
Evan Millar
35bfb226aa am 8290ab75: am b27a1166: Merge change 27233 into eclair 
Merge commit '8290ab75330d055584351005137d1a61c6a3b345'

* commit '8290ab75330d055584351005137d1a61c6a3b345':
  Change longClick -> click in ContactHeaderWidget.
 2009-09-28 01:08:37 -07:00
Dianne Hackborn
4e4607c5ad am 9f704306: am 075a18d6: Turn on haptic feedback by default. 
Merge commit '9f704306846ea8d941511fbf4a506cd59e5a8479'

* commit '9f704306846ea8d941511fbf4a506cd59e5a8479':
  Turn on haptic feedback by default.
 2009-09-28 01:08:18 -07:00
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
Marco Nelissen
c46f886b63 am 0faa5c6c: Merge change 27271 into eclair 
Merge commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2' into eclair-plus-aosp

* commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2':
  Only scan windows media files when those codecs are enabled.
 2009-09-27 12:24:17 -07:00
Android (Google) Code Review
0faa5c6c5a Merge change 27271 into eclair 
* changes:
  Only scan windows media files when those codecs are enabled.
 2009-09-27 15:19:27 -04:00
Marco Nelissen
0ddbc35dc4 Only scan windows media files when those codecs are enabled. 2009-09-27 11:25:49 -07:00
Mike Cleron
6a1f439903 am 954e98e0: Merge change 27267 into eclair 
Merge commit '954e98e023568b354aeec0a54668155ad9083398' into eclair-plus-aosp

* commit '954e98e023568b354aeec0a54668155ad9083398':
  Add official assets for tabs in compatibility mode
 2009-09-27 11:12:55 -07:00
Android (Google) Code Review
954e98e023 Merge change 27267 into eclair 
* changes:
  Add official assets for tabs in compatibility mode
 2009-09-27 14:05:05 -04:00
Mike Cleron
68d9254d59 Add official assets for tabs in compatibility mode 2009-09-27 11:00:14 -07:00