Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,755 Commits 3 Branches 0 Tags
ee9907b4619ea9f3551ee7f5a2c5a803e3ee636c
Commit Graph

9341 Commits

Author SHA1 Message Date
Jacek Surazski
ee9907b461 Merge "Add dumping of Running Service reports to ApplicationErrorReports" 2010-08-03 11:08:21 -07:00
Vasu Nori
6cd0cc4606 Merge "random but useful stuff" 2010-08-03 10:50:56 -07:00
Vasu Nori
0732f7912c random but useful stuff 
1. move binding of args to one place - to SQLiteProgram
2. reduce locking time in SQLiteDatabase
3. reduce locking during time of binding of args
4. rmeove test for the deprecated ArrayListCursor
5. a couple of nits here and there

Change-Id: I20c33c8ffe3325df67af655f1d20614f7f727cb7
 2010-08-03 10:48:14 -07:00
Elliott Hughes
5515b54d92 Merge "Switch android.webkit.MimeTypeMap over to libcore.net.MimeUtils' table." 2010-08-03 10:45:35 -07:00
Robert Greenwalt
fa64bcfb01 Merge "Don't reset connections switching default->hipri" 2010-08-03 09:52:48 -07:00
Makoto Onuki
ec37c88570 Adding a method called when detecting content change. 
Added Loader.onContentChanged()  which is called by ForceLoadContentObserver
when it detects a change, rather than forceLoad().

By default onContentChanged() just calls forceLoad(), so there's no change
in behavior.

This is useful when a subclass wants to perform custom operations upon
data chantes.  For example, a subclass may want to limit the number
of automatic requeries per second.

Change-Id: I493dac3f4f1a75b056d2c7065336ea9252dbf424
 2010-08-03 09:30:47 -07:00
Jacek Surazski
87d0b2f422 Add dumping of Running Service reports to ApplicationErrorReports 
Change-Id: I5f10bf81af384777da2ac2d2c00463b766a4fb67
 2010-08-03 15:02:12 +02:00
Romain Guy
7768e02973 Merge "Add support for ColorFilters." 2010-08-02 18:50:28 -07:00
Romain Guy
db1938e0e6 Add support for ColorFilters. 
Color filters are fully supported and can be used with shaders.

Change-Id: Id90ccf1c81cb462f2431f366f3f8f710d7971e04
 2010-08-02 18:50:56 -07:00
Robert Greenwalt
153b4374d0 Don't reset connections switching default->hipri 
A usecase is to use hipri to keep alive 3g connections when wifi
is about to be brought up.  They are the same network, so don't
do the reset unless both are down.

This will go away when we get the deferred network downing.

bug:2865630
Change-Id: I07729b7776fe5ea129120c688cf7839a55a7ed95
 2010-08-02 18:13:42 -07:00
Vasu Nori
532abb6530 add public method in ContentValues to return set of all keys 
why not this method? it is useful and cheap.

Change-Id: I5db96d149b13d26b5359b52515a8eabf033eb000
 2010-08-02 17:46:57 -07:00
Oscar Montemayor
1da47a9401 Merge "Global Proxy changes to proxy class." 2010-08-02 17:02:13 -07:00
Oscar Montemayor
16fb7910fd Global Proxy changes to proxy class. 
Change-Id: Ib2da33670b1da33c0b35b60f4fcbd0bc084e616a
 2010-08-02 16:29:29 -07:00
Vasu Nori
ec4ffa91e8 Merge "before shipping, remove stacktrace printing in requery-warning msg" 2010-08-02 16:22:22 -07:00
Adam Powell
9168f0b170 Add ActionMode#getMenuInflater() for easier menu inflation in 
ActionMode.Callback implementations

Change-Id: If9e7ab0d65598bab537add6c6a452a55c093064f
 2010-08-02 16:02:24 -07:00
Elliott Hughes
0f11696164 Switch android.webkit.MimeTypeMap over to libcore.net.MimeUtils' table. 
(Said table is the very same data that used to be, but pushed further down
the dependencies so that it can be shared with java.net.URLConnection, so
the two classes' equivalent methods return the same results.)

Bug: 2422917
Bug: http://code.google.com/p/android/issues/detail?id=10100
Change-Id: Ic4e80c2fede22671e825d569f349e4329dcf01ea
 2010-08-02 15:25:16 -07:00
Vasu Nori
e7fa4aeb60 before shipping, remove stacktrace printing in requery-warning msg 
this is to reduce log spamming
Change-Id: I9b6e08905fbf7f880e49144a4ffcf01550a521c9
 2010-08-02 15:06:52 -07:00
Vasu Nori
ce38b98feb do begin-end transaction before standalone insert/update/delete sql 
also fix bug# 2871037
Change-Id: I13325f8eabff4f218d3206905010803b61d8e2cd
 2010-08-02 14:51:33 -07:00
Kenny Root
b0289f62af am 59d4a536: am 739cdab7: Merge "Do not deference before null check" into gingerbread 
Merge commit '59d4a5369cd68d4b65809ded407611b62b013f9a'

* commit '59d4a5369cd68d4b65809ded407611b62b013f9a':
  Do not deference before null check
 2010-08-02 13:31:41 -07:00
Kenny Root
59d4a5369c am 739cdab7: Merge "Do not deference before null check" into gingerbread 
Merge commit '739cdab7cb63d53440bb411fa2d558e2114b4c81' into gingerbread-plus-aosp

* commit '739cdab7cb63d53440bb411fa2d558e2114b4c81':
  Do not deference before null check
 2010-08-02 13:29:01 -07:00
Kenny Root
739cdab7cb Merge "Do not deference before null check" into gingerbread 2010-08-02 12:33:40 -07:00
Adam Powell
8350f7dbc3 Added CHOICE_MODE_MULTIPLE_MODAL to ListView. 
Based on ActionModes, CHOICE_MODE_MULTIPLE_MODAL supports the new
Honeycomb-style selection mode.

Change-Id: I293ea22487db8e081c95e5236f1e053f7dd4ada6
 2010-08-02 11:28:31 -07:00
Brad Fitzpatrick
8b13ed701b am 4edd80db: am ee34a49f: Add missing word from docs. 
Merge commit '4edd80db956a6a3fc1142371d098ad2abd06ac9c'

* commit '4edd80db956a6a3fc1142371d098ad2abd06ac9c':
  Add missing word from docs.
 2010-08-02 08:09:07 -07:00
Brad Fitzpatrick
4edd80db95 am ee34a49f: Add missing word from docs. 
Merge commit 'ee34a49ffc92590cb59f3e17a3df136b67701529' into gingerbread-plus-aosp

* commit 'ee34a49ffc92590cb59f3e17a3df136b67701529':
  Add missing word from docs.
 2010-08-02 08:02:05 -07:00
Brad Fitzpatrick
ee34a49ffc Add missing word from docs. 
My mistaker from an earlier commit.

Change-Id: Ic04b3c411da32f7dca03d23d39182915e3567172
 2010-08-02 07:54:18 -07:00
Kenny Root
930d3af75f Do not deference before null check 
The return of parsePackageLite wasn't checked until after it was
deferenced. Move the deference below the null check and remove redundant
set.

Bug: 2852726
Change-Id: I3eaaea5050948145eed44b64507dc846993d98eb
 2010-08-02 07:52:56 -07:00
Romain Guy
eb4e0c3c1c Merge "Refactor Skia shaders handling." 2010-07-30 19:20:09 -07:00
Romain Guy
06f96e2652 Refactor Skia shaders handling. 
With this change, Skia shaders can easily be applied to any mesh. This change also
supports ComposeShader. For instance, this can be used to blend a gradient and a
bitmap togehter and paint a string of text with the result.

Change-Id: I701c2f9cf7f89b2ff58005e8a1d0d80ccf4a4aea
 2010-07-30 19:18:16 -07:00
Chet Haase
4de823a759 Merge "Fix problems with moving Views around (invalidation, conflict with layout)" 2010-07-30 17:14:29 -07:00
Tadashi G. Takaoka
c8f5e43719 Merge "Fix KeyboardView's verticalCorrection handling" 2010-07-30 16:34:06 -07:00
Tadashi G. Takaoka
0972d071cd Fix KeyboardView's verticalCorrection handling 
Do not correct the touch point if it is within the range of
verticalCorrection from the top of KeyboardView, so that the touch
point will not have negative y-axis value.

Bug: 2659128

Change-Id: I91a3e65fc5dee1383dbbfb45690e307fc0adc1d1
 2010-07-30 16:08:47 -07:00
Brad Fitzpatrick
86dde2d64c am e2d33bbc: am d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread 
Merge commit 'e2d33bbc496192d49c1e48baad446d8d0720d301'

* commit 'e2d33bbc496192d49c1e48baad446d8d0720d301':
  StrictMode: time violations in Binder calls
 2010-07-30 15:27:56 -07:00
Brad Fitzpatrick
e2d33bbc49 am d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread 
Merge commit 'd2165cfce7911dac66d1195ed9123e79b086d22b' into gingerbread-plus-aosp

* commit 'd2165cfce7911dac66d1195ed9123e79b086d22b':
  StrictMode: time violations in Binder calls
 2010-07-30 15:23:19 -07:00
Brad Fitzpatrick
d2165cfce7 Merge "StrictMode: time violations in Binder calls" into gingerbread 2010-07-30 15:20:28 -07:00
Chet Haase
8fbf8d2b08 Fix problems with moving Views around (invalidation, conflict with layout) 
Change-Id: I38f8f8a4e8082854a53a2975da258b5d946ed525
 2010-07-30 15:01:32 -07:00
Brad Fitzpatrick
cb9ceb1029 StrictMode: time violations in Binder calls 
Change-Id: I5796993dce98be722cf679b78acaf0c9de0ba461
 2010-07-30 14:28:55 -07:00
Daniel Sandler
84383376d8 Merge "More readable Configuration#toString() output." 2010-07-30 12:10:33 -07:00
Dmitri Plotnikov
025b6ec308 Merge "Adding a lookup URI to simplify loading of a contact" 2010-07-30 12:03:17 -07:00
Gilles Debunne
56329b46ad am 628be513: am 83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo 
Merge commit '628be513e67ce6c61884b1baaf0379abfc56100b' into gingerbread-plus-aosp

* commit '628be513e67ce6c61884b1baaf0379abfc56100b':
  Fixed doc typos in HeterogeneousExpandableList.java.
 2010-07-30 11:56:24 -07:00
Gilles Debunne
628be513e6 am 83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo 
Merge commit '83884db9dc0fbddb6ece566284259f6b941beb33' into gingerbread

* commit '83884db9dc0fbddb6ece566284259f6b941beb33':
  Fixed doc typos in HeterogeneousExpandableList.java.
 2010-07-30 11:53:16 -07:00
Steve Howard
48c05739dd am 6a114b21: am 7c600369: Merge "Update Context.getSystemService() docs for download manager." into gingerbread 
Merge commit '6a114b211a77bdd4f4c687f99f9e5f9273ec1a76'

* commit '6a114b211a77bdd4f4c687f99f9e5f9273ec1a76':
  Update Context.getSystemService() docs for download manager.
 2010-07-30 11:15:44 -07:00
Steve Howard
6a114b211a am 7c600369: Merge "Update Context.getSystemService() docs for download manager." into gingerbread 
Merge commit '7c600369c9695de73ca37db552eb81b8b89d5e76' into gingerbread-plus-aosp

* commit '7c600369c9695de73ca37db552eb81b8b89d5e76':
  Update Context.getSystemService() docs for download manager.
 2010-07-30 11:12:28 -07:00
Steve Howard
7c600369c9 Merge "Update Context.getSystemService() docs for download manager." into gingerbread 2010-07-30 11:09:48 -07:00
Mathias Agopian
fdece4bbbf resolved conflicts for merge of dfce290b to master 
Change-Id: I9caace962cb0a697dd99ed92c5f35e57690fdf91
 2010-07-29 22:22:36 -07:00
Mathias Agopian
ce49d03aa4 resolved conflicts for merge of 02513855 to master 
Change-Id: Ie33d57798d3d5b800edde753dac86de062bc270c
 2010-07-29 22:06:44 -07:00
Dianne Hackborn
8952f695a3 Fix crash. 
Change-Id: Ie8871376213930f1c57ea5f8e67142daf7fbe089
 2010-07-29 19:07:23 -07:00
Dmitri Plotnikov
b2ce481c81 Adding a lookup URI to simplify loading of a contact 
This will be initially used by the editor to load
the entire contacts in a consistent manner either
locally or from a Directory.

Change-Id: I0e02b1b35cbbb3c4443063684641c928e5ac5318
 2010-07-29 18:28:50 -07:00
Mathias Agopian
dfce290b80 am 04d7e83e: Added SensorManager.getAltitude() 
Merge commit '04d7e83e65e246e154b5b346e3eb0081b741ae88' into gingerbread-plus-aosp

* commit '04d7e83e65e246e154b5b346e3eb0081b741ae88':
  Added SensorManager.getAltitude()
 2010-07-29 18:21:03 -07:00
Mathias Agopian
0251385553 am 050b5624: Added SensorManager.getMinDelay() 
Merge commit '050b56244ff46d43e4886018d7cd20f0b1dc02b9' into gingerbread-plus-aosp

* commit '050b56244ff46d43e4886018d7cd20f0b1dc02b9':
  Added SensorManager.getMinDelay()
 2010-07-29 18:20:51 -07:00
Mathias Agopian
04d7e83e65 Added SensorManager.getAltitude() 
this is a helper function to calculate the altitude from the
pressure and pressure at sea level.

Change-Id: I3f6f14fee6190388f95afa36a66287e3d59eef9b
 2010-07-29 18:18:01 -07:00