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

8497 Commits

Author SHA1 Message Date
Adam Powell
68464a9599 Fix bug 2747634 - Crash on selecting wifi 
Allow Spinner to call setAdapter during superclass construction.

Change-Id: Ia57d231249b28de3809d7ee09a77277eac1553ca
 2010-06-07 12:48:07 -07:00
Robert Greenwalt
05fefe62ee am 1bdb78c1: am 9c4ed139: am f9610b38: Merge "Make the DUN apn data secure." into froyo 2010-06-06 12:13:55 -07:00
Robert Greenwalt
9c4ed1394b am f9610b38: Merge "Make the DUN apn data secure." into froyo 
Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into kraken

* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
  Make the DUN apn data secure.
 2010-06-06 12:10:00 -07:00
Grace Kloba
362a255d6e Merge "Do not call AlertDialog.show() if the context is not the focused Activity. In that case, just take the default cancel." 2010-06-04 21:36:45 -07:00
Grace Kloba
fba3197d9e Do not call AlertDialog.show() if the context is not 
the focused Activity. In that case, just take the
default cancel.

Change JSAlert to be cancelable like JSConfirm.

Fix http://b/issue?id=2741195
 2010-06-04 17:31:33 -07:00
Vasu Nori
81b65ebc52 Merge "when database is opened, set journal_mode to TRAUNCATE" 2010-06-04 17:09:00 -07:00
Vasu Nori
f9e2bd085f when database is opened, set journal_mode to TRAUNCATE 
this journal_mode is more efficnent than the default journal_mode (DELETE)

Change-Id: I8879d3fe8dda410f4674ead9270aa7ecdaf91b5e
 2010-06-04 17:08:31 -07:00
Dianne Hackborn
e399f9d33f Merge "Fix issue #2733766: Crash in Gallery onDestroy: java.lang.RuntimeException" 2010-06-04 15:26:35 -07:00
Dianne Hackborn
c39a5dcbe1 Fix issue #2733766: Crash in Gallery onDestroy: java.lang.RuntimeException 
Change-Id: I1c67a6603c23d15fef9a6912c86ffdf77aaa8654
 2010-06-04 14:34:29 -07:00
Adam Powell
e25d3d1ef8 Merge "Fix doc build" 2010-06-04 14:25:21 -07:00
Adam Powell
a984b38df5 Fix doc build 
Change-Id: Ia0425bc956540bbd5f16138ad182ae365bf1c85a
 2010-06-04 14:20:10 -07:00
Dianne Hackborn
d0b15cecc6 resolved conflicts for merge of f3307ae8 to master 
Change-Id: Ic59db363391f73343eba32894113914ceea5a963
 2010-06-04 14:09:02 -07:00
Adam Powell
1bba846ed1 Merge "Added ListPopupWindow. Refactored AutoCompleteTextView and Spinner (optionally) to use it. Added associated styles." 2010-06-04 13:33:40 -07:00
Dianne Hackborn
faed5fbf15 Merge "Add support for heavy-weight applications." into kraken 2010-06-04 13:30:32 -07:00
The Android Open Source Project
eefd63e357 am 0a0c57f9: am 7c035d8a: am 2d743fe2: merge from open-source master 2010-06-04 13:02:38 -07:00
The Android Open Source Project
7c035d8a65 am 2d743fe2: merge from open-source master 
Merge commit '2d743fe2f39397d41334001d897eb78da56e94ef' into kraken

* commit '2d743fe2f39397d41334001d897eb78da56e94ef':
  Add better error handling for savePicture and restorePicture
 2010-06-04 12:58:09 -07:00
Adam Powell
c3fa6304c9 Added ListPopupWindow. Refactored AutoCompleteTextView and Spinner 
(optionally) to use it. Added associated styles.

ListPopupWindow allows apps to present a popup window of options to
the user that will correctly dodge the IME if needed.

Change-Id: I509c6c45036856daab686a6edeb7a9de1e72eb0a
 2010-06-04 12:18:16 -07:00
Robert Greenwalt
77b32ddbbe Make the DUN apn data secure. 
Rather than come out of the user-modifiable APN DB, the DUN APN data will
come first from a built-in resource and then potentially overriden by a secure
setting (which is gservices upgradable).

Also made the "require-dun" setting secure-setting overridable.
bug:2736390

Change-Id: I1e4644c3839f06c977b83797641f3948785146a2
 2010-06-04 11:13:34 -07:00
The Android Open Source Project
2d743fe2f3 merge from open-source master 
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
 2010-06-04 11:08:36 -07:00
Dianne Hackborn
860755faa6 Add support for heavy-weight applications. 
Only one can be running at a time, their process can not be killed,
and a notification is posted while it is running.

Change-Id: I843015723947e0c934ae63a1aeee139327c0bc01
 2010-06-04 10:09:13 -07:00
Wu-cheng Li
3c358eb7bd am 2f98f99c: am 5f5df382: Merge "Add camera metering mode API." into kraken 2010-06-03 22:35:40 -07:00
Wu-cheng Li
5f5df382e5 Merge "Add camera metering mode API." into kraken 2010-06-03 22:32:05 -07:00
Kenny Root
c4a1a927a8 Merge "Fix alignment issues with RTL paragraphs." 2010-06-03 18:26:55 -07:00
Brad Fitzpatrick
e407a608b0 resolved conflicts for merge of 7d6362de to master 
Change-Id: Ic26dd6d617f0edba549c992256511613df00caa6
 2010-06-03 17:15:48 -07:00
Vasu Nori
2134369e80 set some members to final, set database errorhandler to default if null. 
Change-Id: I1c2d8181e7fe60c869178a43dcc00519dd0072c7
 2010-06-03 16:01:39 -07:00
Vasu Nori
03acd51bae fix docs errors 
Change-Id: I775dc3e665a8ce32ed6c95f3240280ddef984bb6
 2010-06-03 14:44:39 -07:00
Romain Guy
fb59fbf14e Merge "Add better error handling for savePicture and restorePicture" 2010-06-03 14:26:21 -07:00
Doug Felt
c982f60e98 Fix alignment issues with RTL paragraphs. 
Also remove unused debugging code that depends on junit.
Remove trailing whitespace in changed code.

Change-Id: Ie02d1b8220c599a672ee6e91af0fba634e0f620c
 2010-06-03 13:33:00 -07:00
Brad Fitzpatrick
cfda9f3a47 Sprinkle new BlockGuard around SQLiteDatabase. 
SQLite is JNI to native code and doesn't go via IFileSystem, so it
needs custom sprinkling, at least for now.

Change-Id: Ic7fded1b64a4f483dfc17b3a7b136c803df1e111
 2010-06-03 12:52:54 -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
Vasu Nori
ac7ae9cc91 Merge "add API to Cursor to get column value type" 2010-06-03 11:46:03 -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
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
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
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
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
Wu-cheng Li
f7f6333831 Add camera metering mode API. 
bug:2737111
Change-Id: Ie986fee56ebeaaed2d2efb757701dfe3ffdec8d8
 2010-06-03 16:34:18 +08: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
98795669b6 am 9310277c: am 798ac4c7: Start moving resources to SystemUI.apk. 2010-06-02 22:40:33 -07:00
Joe Onorato
fb1bd96ffb am ef5ce59a: am 18e69dfc: Checkpoint. Data structures for Notifications in place. 2010-06-02 22:38:43 -07:00
Joe Onorato
37166e6d7e am ff97998a: am 4762c2d7: Add expand and collapse. 2010-06-02 22:38:20 -07:00