Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,814 Commits 3 Branches 0 Tags
ddcafcbd62c4efdc70bc626ab210a3c41dd1333c
Commit Graph

8482 Commits

Author SHA1 Message Date
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
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
The Android Open Source Project
2d743fe2f3 merge from open-source master 
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
 2010-06-04 11:08:36 -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
Joe Onorato
60a83af048 am ee5d0caf: am f3f0e053: Make disable() work. 2010-06-02 22:38:10 -07:00
Joe Onorato
e635a6bcc1 am 12cd606d: am 0cbda99f: The status bar draws its icons now. 2010-06-02 22:37:04 -07:00
Joe Onorato
eec1329048 am 627cfa94: am 90233a1e: Add IStatusBar 2010-06-02 22:36:11 -07:00
Joe Onorato
51b3c2f25f am e0b2ae11: am 25f95f92: Rename IStatusBar to IStatusBarService. 2010-06-02 22:35:58 -07:00
Joe Onorato
eeb42c4ebd am 2cbaf806: am 2314aab5: First pass at splitting the status bar for the different devices. 2010-06-02 22:35:46 -07:00
Vasu Nori
8b0dd7da36 add API to Cursor to get column value type 
Change-Id: I3ef1bcdb2eb1c45f68e829ccb6e3ecde28076591
 2010-06-02 17:40:41 -07:00
Kenny Root
3e7432f823 Merge "Fix IndexOutOfBoundsException when measuring text." 2010-06-02 16:21:31 -07:00
Jeff Brown
ca583f0966 Merge "Fixed some minor bugs in MotionEvent recycling." into kraken 2010-06-02 15:46:13 -07:00
Jeff Brown
d28f4be870 Fixed some minor bugs in MotionEvent recycling. 
1. MotionEvent.recycle() never set mRecycled to true so it couldn't actually
   detect doubly-recycled events (unless the TRACK_RECYCLED_LOCATION debuging
   flag was enabled).

2. MotionEvent.obtain() did not set mNext to null before returning the event
   so it would unnecessarily retain a reference to other events in the
   recycled event linked list until recycled again.

Change-Id: I93709c402d260691875f632dfc080a355f85fbb0
 2010-06-02 15:36:01 -07:00
Joe Onorato
798ac4c7d7 Start moving resources to SystemUI.apk. 
Change-Id: Ibf30b8196d65d7fbca1177968cefa5f7a875bf1d
 2010-06-02 14:48:45 -07:00
Joe Onorato
18e69dfc72 Checkpoint. Data structures for Notifications in place. 
Change-Id: I146fb9bc1d349112541368e2c99a667821dfdf6e
 2010-06-02 14:48:43 -07:00
Joe Onorato
4762c2d75a Add expand and collapse. 
Change-Id: I58ad95c59b2c46d3f25349e137d5624aefc6c6cd
 2010-06-02 14:48:42 -07:00
Joe Onorato
f3f0e053f0 Make disable() work. 
Change-Id: I93fea37e777b3e04fe7f9171d5b84821587c24f5
 2010-06-02 14:48:42 -07:00
Joe Onorato
0cbda99f87 The status bar draws its icons now. 2010-06-02 14:48:41 -07:00
Joe Onorato
90233a1ee5 Add IStatusBar 
Change-Id: Ie73d665085d5ce7358c285bf332ef1dc96005d0f
 2010-06-02 14:48:40 -07:00