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

24760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
7c0761052e am b7371455: am c458d0e3: am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo 2010-06-03 13:04:01 -07:00
Dirk Dougherty
b7371455e8 am c458d0e3: am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo 2010-06-03 13:02:28 -07:00
Dirk Dougherty
c458d0e307 am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo 
Merge commit 'b85a1679a4a6fae5dd39611ae594f5e2b945407c' into kraken

* commit 'b85a1679a4a6fae5dd39611ae594f5e2b945407c':
  Doc change: Adjust security sandbox description.
 2010-06-03 13:00:31 -07:00
Dirk Dougherty
b85a1679a4 am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo 
Merge commit '85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e' into froyo-plus-aosp

* commit '85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e':
  Doc change: Adjust security sandbox description.
 2010-06-03 12:58:35 -07:00
Dirk Dougherty
85a1c57830 Merge "Doc change: Adjust security sandbox description." into froyo 2010-06-03 12:57:06 -07:00
Vasu Nori
512596d425 Merge "new API in Context. on openDatabase, new param DatabaseErrorHandler" 2010-06-03 12:42:32 -07:00
Romain Guy
f8b0f11a94 Merge "Fix memory leak in LocalActivityManager. Also properly removes embedded activities. Bug #2738247" 2010-06-03 12:39:53 -07:00
Vasu Nori
74f170f946 new API in Context. on openDatabase, new param DatabaseErrorHandler 
add new method openOrCreateDatabase in Context.java to allow
callers specify a DatabaseErrorHandler object to be used when
database corruption occurs.
add new constructor in SQLiteOpenHelper to accept DatabaseErrorHandler
as an additional param to be used when SQLiteDatabase instance is
created.

Change-Id: I912a0202a74510f9ca0206dd8101c4abab9102ae
 2010-06-03 12:38:11 -07:00
Elliott Hughes
26ae7875ad Remove dead classes from the preload list. 
Change-Id: I90799fe258ea23db764193fc5fab1a25c13b5563
 2010-06-03 12:10:28 -07:00
Elliott Hughes
55bd466d78 Fix build by adding Java 6 API changes that were not in the earlier merge. 
Change-Id: I10425b6932fc69e206da5a2cf9e120c007eec9cd
 2010-06-03 12:08:56 -07:00
Vasu Nori
ac7ae9cc91 Merge "add API to Cursor to get column value type" 2010-06-03 11:46:03 -07:00
James Dong
e4c8aa60e3 am a3d1c3cd: am 57ad0703: am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo 2010-06-03 11:34:36 -07:00
James Dong
a3d1c3cd96 am 57ad0703: am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo 2010-06-03 11:32:29 -07:00
James Dong
57ad07039a am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo 
Merge commit 'c40209ac60a64a7c08b0d0028060d5308fd7a0b8' into kraken

* commit 'c40209ac60a64a7c08b0d0028060d5308fd7a0b8':
  Fix a Javadoc to clarify when setAudioStreamType() should be called.
 2010-06-03 11:30:03 -07:00
James Dong
c40209ac60 am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo 
Merge commit '28a92b2e76a13c18dc23e5239717b122a174182f' into froyo-plus-aosp

* commit '28a92b2e76a13c18dc23e5239717b122a174182f':
  Fix a Javadoc to clarify when setAudioStreamType() should be called.
 2010-06-03 11:27:19 -07:00
James Dong
28a92b2e76 Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo 2010-06-03 11:26:09 -07:00
Vasu Nori
76bb78ebcc Merge "cleanup some small but ugly things. all minor things." 2010-06-03 11:07:20 -07:00
Vasu Nori
ccd954480c cleanup some small but ugly things. all minor things. 
Change-Id: I6a3ea9ad563ea895e7f3c37647bdadd2cfa8fc29
 2010-06-03 11:06:47 -07:00
Romain Guy
d315ee93c6 Fix memory leak in LocalActivityManager. Also properly removes embedded activities. 
Bug #2738247

Change-Id: Ib75be22fde5f1408250947566c69174c6f248c98
 2010-06-03 11:03:18 -07:00
Romain Guy
f7353da8a0 Merge "Do not invoke onProgressUpdate if the task is canceled. Bug #2734382" 2010-06-03 10:58:05 -07:00
Romain Guy
4aaf8ec9df Do not invoke onProgressUpdate if the task is canceled. 
Bug #2734382

Change-Id: I8d507ae72af2f6dfe66598fb9090872520111a6b
 2010-06-03 10:56:41 -07:00
James Dong
9d96354d70 Fix a Javadoc to clarify when setAudioStreamType() should be called. 
bug - 2737926

Change-Id: I8718c3d1a544cf5cb1b7e98b6c24fe0e6d3574ba
 2010-06-03 10:37:28 -07:00
Derek Sollenberger
627eca9b62 Merge "Update EmbeddedZoomControl to use new ZoomManager methods." 2010-06-03 10:35:04 -07:00
Derek Sollenberger
5c1c29a1e9 Merge "Refactor zoom logic from WebView to ZoomManager." 2010-06-03 10:07:05 -07:00
Kenny Root
453bcedeaa am 5095232d: am 15fe2cb7: Add error checking for translatable strings 2010-06-03 09:37:14 -07:00
Kenny Root
5095232d25 am 15fe2cb7: Add error checking for translatable strings 2010-06-03 09:36:00 -07:00
Kenny Root
15fe2cb73b Add error checking for translatable strings 
Translatable strings that have multiple substitutions should use
positional String.format() substitutions. This change makes it an error
not to use that format on translatable strings that have more than one
substitution in its text.

Change-Id: I3a19707f3804aa24e8568dc1653a11576cac5916
 2010-06-03 09:33:43 -07:00
The Android Open Source Project
4f2cf8af55 am 913dbc50: am a9f06fef: am ee7e6a78: merge from open-source master 2010-06-03 09:12:40 -07:00
The Android Open Source Project
913dbc5061 am a9f06fef: am ee7e6a78: merge from open-source master 2010-06-03 09:10:54 -07:00
The Android Open Source Project
a9f06fef8e am ee7e6a78: merge from open-source master 
Merge commit 'ee7e6a78e28b360826f215e0e84d43b1513b6401' into kraken

* commit 'ee7e6a78e28b360826f215e0e84d43b1513b6401':
  Improved error-handling in Rfc822Tokenizer
 2010-06-03 09:09:07 -07:00
The Android Open Source Project
ee7e6a78e2 merge from open-source master 
Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9
 2010-06-03 09:03:58 -07:00
Leon Clarke
790e71d814 Merge "Add indexeddb files to the skip list" 2010-06-03 07:05:47 -07:00
Leon Clarke
970effc07c Add indexeddb files to the skip list 2010-06-03 15:00:11 +01:00
Derek Sollenberger
341e22ffce Refactor zoom logic from WebView to ZoomManager. 
This CL is one in a series of CL's intended to remove the zoom
logic from WebView. This CL focuses on refactoring the initialScale
variable as well as the onSizeChanged() and NEW_PICTURE_MSG portions
of the code.

Change-Id: Id44bce50378aa7cdfc1c8110818e18500679c517
http://b/2671604
 2010-06-03 09:37:36 -04:00
Mike Lockwood
b4985e0e69 Merge "Prototype Content Provider support for MTP/PTP devices." 2010-06-03 06:00:45 -07:00
Ben Murdoch
9b815d0801 DumpRenderTree changes 
- Make the layout test counter work when you run tests through the GUI
- Use the progress bar in the applications title bar to display test progress

Change-Id: I3d4b778470e812b80b7a64297b3a64ba6f9d083c
 2010-06-03 12:39:09 +01:00
Jeff Brown
22449c1d3b am 1bcc845f: am ca583f09: Merge "Fixed some minor bugs in MotionEvent recycling." into kraken 2010-06-02 22:41:30 -07:00
Joe Onorato
1a26b6a3f1 am 5e76d148: am 169af47b: remove logging 2010-06-02 22:41:20 -07:00
Joe Onorato
5f2d44c925 am bffd90a5: am c91460d2: Pull the carrier name display in the windowshade out into its own view. 2010-06-02 22:41:16 -07:00
Joe Onorato
381a5a260e am e3a6e01c: am 1a86dd10: Use the built-in handler instead of allocating another one. 2010-06-02 22:41:11 -07:00
Joe Onorato
d3b35158a7 am ed9ce2e0: am f5510540: Get the ticker working again. 2010-06-02 22:41:06 -07:00
Joe Onorato
b86397da2c am 283bbf36: am 9834d534: better debugging "slot" for the notification icons. 2010-06-02 22:41:01 -07:00
Joe Onorato
33e2f07e55 am 50515e44: am 75199e3d: Populate the notifications at startup of SystemUI.apk. 2010-06-02 22:40:56 -07:00
Joe Onorato
27fcf77a0f am cdadef36: am b77f53b2: Get the IconMerger working again. 2010-06-02 22:40:48 -07:00
Daniel Sandler
94b9a9470f am f79bceaf: am 87937dbc: New shadowy status bar, direct from Z\'ha\'dum. 2010-06-02 22:40:42 -07:00
Joe Onorato
98795669b6 am 9310277c: am 798ac4c7: Start moving resources to SystemUI.apk. 2010-06-02 22:40:33 -07:00
Joe Onorato
48ba934c49 am f00734fe: am 79de0c55: Move the StatusBarPhone package into a new catch-all SystemUI.apk. 2010-06-02 22:40:27 -07:00
Joe Onorato
7a3dbac36d am aa6c3f77: am 7dd8c6e4: Remove unused files from the service package. 2010-06-02 22:40:21 -07:00
Joe Onorato
eff8102682 am f419c631: am 175f79c5: In fact, switching an item between ongoing and notifications works. 2010-06-02 22:40:09 -07:00
Joe Onorato
55d31bcee4 am 04e022ff: am 5ee67ebf: Get the text appearance compiling 2010-06-02 22:39:57 -07:00