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

27700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kolb
11945d1f47 fixed webkit version number in user agent string 
Change-Id: Ieb0843140a682d35bacc2bd273d7c697f02746a4
 2010-08-03 10:25:07 -07:00
Wink Saville
ae2036a8f9 am 7472c219: am 1540a7ea: am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber. 
Merge commit '7472c219a13e3f9f74d9a4adf1478e9c4f9248a2'

* commit '7472c219a13e3f9f74d9a4adf1478e9c4f9248a2':
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
 2010-08-02 12:09:03 -07:00
Nipun Kwatra
c3c9f12b08 Merge "including limits.h to fix simulator build." 2010-08-02 12:08:42 -07:00
Wink Saville
7472c219a1 am 1540a7ea: am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber. 
Merge commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed' into gingerbread-plus-aosp

* commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed':
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
 2010-08-02 12:06:34 -07:00
Wink Saville
1540a7ea1a am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber. 
Merge commit 'c69f5be0ed3529564e5db6874de52775c2c99007' into gingerbread

* commit 'c69f5be0ed3529564e5db6874de52775c2c99007':
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
 2010-08-02 12:02:42 -07:00
Daniel Sandler
6976e1d0d7 Merge "Actually reference the fixed Proguard flags." 2010-08-02 11:53:59 -07:00
Daniel Sandler
1ab5cae8df Actually reference the fixed Proguard flags. 
Bug: 2869888
Change-Id: I3277b51cd411c7933607c08b6022870ef83e9197
 2010-08-02 14:53:16 -04:00
Adam Powell
d3122de292 Merge "Added CHOICE_MODE_MULTIPLE_MODAL to ListView." 2010-08-02 11:32:57 -07:00
Nipun Kwatra
7d435c5e7e including limits.h to fix simulator build. 
Change-Id: I473a62ab8282e4e89e48ee6d7e99aec6ed37076a
 2010-08-02 11:30:06 -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
Wink Saville
c69f5be0ed Add PhoneSubInfo.getCompleteVoiceMailNumber. 
PhoneSubInfo.getVoiceMailNumber now returns only the network
portion of the voicemail number. Use the new method
PhoneSubInfo.getCompleteVoiceMailNumber to get the netowrk
portion and the post dial portion.

Bug: 2881483
Change-Id: I7637d4fa0ffa046b4eebc4d599719bb668c940b5
 2010-08-02 11:07:51 -07:00
Nipun Kwatra
16f8c620ab Merge "Implementing getSupportedPictureSizes" 2010-08-02 10:12:20 -07:00
Nipun Kwatra
b1fb6079ef Implementing getSupportedPictureSizes 
Go through all the supported picture sizes and choose the smallest one with
both dimensions higher than the passed in video width and height.

Change-Id: I4e9fe7a6384a0feeb9e069239ec68c70fb5f3033
 2010-08-02 09:49:07 -07:00
Scott Main
08364d867e am 77a66069: am d3579580: am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo 
Merge commit '77a66069eb8fa0b99d090effa1d71b1fec992bdd'

* commit '77a66069eb8fa0b99d090effa1d71b1fec992bdd':
  Doc change: Add nexus one to dev phones.
 2010-08-02 09:36:15 -07:00
Scott Main
77a66069eb am d3579580: am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo 
Merge commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368' into gingerbread-plus-aosp

* commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368':
  Doc change: Add nexus one to dev phones.
 2010-08-02 09:29:49 -07:00
Scott Main
d3579580df am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo 
Merge commit '9cd797902ec8404c5958214fc078d75e87248bf3' into gingerbread

* commit '9cd797902ec8404c5958214fc078d75e87248bf3':
  Doc change: Add nexus one to dev phones.
 2010-08-02 09:23:50 -07:00
Scott Main
9cd797902e Merge "Doc change: Add nexus one to dev phones." into froyo 2010-08-02 09:16:30 -07:00
Mike Lockwood
2b51f47a4c Merge changes Iccc3a445,I82ce80a4 
* changes:
  MTP: Implement GetNumObjects
  Clean up MtpDatabase API.
 2010-08-02 08:38:02 -07:00
Maksymilian Osowski
13ee57e89e Merge "Time-out mechanism and state machine." 2010-08-02 08:24:11 -07:00
Maksymilian Osowski
42bee9cf76 Time-out mechanism and state machine. 
Change-Id: I47c4342c02ea152b1503b9d5268900df3b40683c
 2010-08-02 16:22:28 +01: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
Mike Lockwood
7a047c8986 MTP: Implement GetNumObjects 
Change-Id: Iccc3a445f9a1eab7bb76eddd567c6a3a8f155b2b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-02 10:52:20 -04:00
Mike Lockwood
59c777a24a Clean up MtpDatabase API. 
Return MTP response codes instead of booleans for success or failure.
Remove some unused code.

Change-Id: I82ce80a4d7779233264e3caf139ebd0cece12f5c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-02 10:37:41 -04:00
Dianne Hackborn
37b4a3c2f2 am f4e145fd: am 543f250d: Merge "Make the systemui process persistent." into gingerbread 
Merge commit 'f4e145fd123a6941348e16a595107b155bd880e8'

* commit 'f4e145fd123a6941348e16a595107b155bd880e8':
  Make the systemui process persistent.
 2010-07-31 12:19:39 -07:00
Mathias Agopian
5688ac84bd am 67e4ff76: am 4d7fc365: Merge "remove copybit hack from software opengl (libagl)" into gingerbread 
Merge commit '67e4ff768d71088a64fbac3b8e398e2e16dd84ec'

* commit '67e4ff768d71088a64fbac3b8e398e2e16dd84ec':
  remove copybit hack from software opengl (libagl)
 2010-07-31 12:19:26 -07:00
Dirk Dougherty
cb2d4c2771 am bd502940: am 483b20e5: am 2ff1ba01: Doc change: Cleanup for licensing doc. 
Merge commit 'bd5029403e0f9d93086604df6dbb1b989e58e964'

* commit 'bd5029403e0f9d93086604df6dbb1b989e58e964':
  Doc change: Cleanup for licensing doc.
 2010-07-31 12:19:18 -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
Dianne Hackborn
f4e145fd12 am 543f250d: Merge "Make the systemui process persistent." into gingerbread 
Merge commit '543f250d9cb05ebca4fb4dacce37545c0bb9a8ca' into gingerbread-plus-aosp

* commit '543f250d9cb05ebca4fb4dacce37545c0bb9a8ca':
  Make the systemui process persistent.
 2010-07-30 19:12:50 -07:00
Dianne Hackborn
543f250d9c Merge "Make the systemui process persistent." into gingerbread 2010-07-30 19:10:01 -07:00
Daniel Sandler
e2e5e6746b Merge "Fix Proguard flags causing crash in system bar." 2010-07-30 19:02:57 -07:00
Daniel Sandler
aee242d3ec Fix Proguard flags causing crash in system bar. 
Bug: 2869888
Change-Id: I32198676732a1f272b12154d87d7917f354bb91c
 2010-07-30 22:01:34 -04:00
Mathias Agopian
67e4ff768d am 4d7fc365: Merge "remove copybit hack from software opengl (libagl)" into gingerbread 
Merge commit '4d7fc3651bd93d588d2b8580010414b59bc67729' into gingerbread-plus-aosp

* commit '4d7fc3651bd93d588d2b8580010414b59bc67729':
  remove copybit hack from software opengl (libagl)
 2010-07-30 18:03:17 -07:00
Mathias Agopian
4d7fc3651b Merge "remove copybit hack from software opengl (libagl)" into gingerbread 2010-07-30 18:01:25 -07:00
Nipun Kwatra
51c2ec2411 Adding getSupportedPictureSizes which returns a Vector of supported Sizes. 
Also added a struct 'Size' containing a width and a height field.
Modified parse_size to optionally set an end pointer pointing to the
character after the found size.

Change-Id: I51a56bbf2cb7c91d7b80a28e6bd6a559f40a1333
 2010-07-30 17:51:59 -07:00
Dirk Dougherty
bd5029403e am 483b20e5: am 2ff1ba01: Doc change: Cleanup for licensing doc. 
Merge commit '483b20e5ae65495d841de1844d97d79fbc0c1866' into gingerbread-plus-aosp

* commit '483b20e5ae65495d841de1844d97d79fbc0c1866':
  Doc change: Cleanup for licensing doc.
 2010-07-30 17:40:28 -07:00
Dirk Dougherty
483b20e5ae am 2ff1ba01: Doc change: Cleanup for licensing doc. 
Merge commit '2ff1ba012c59169c9719cfab4516b9149414380b' into gingerbread

* commit '2ff1ba012c59169c9719cfab4516b9149414380b':
  Doc change: Cleanup for licensing doc.
 2010-07-30 17:37:39 -07:00
Dianne Hackborn
26755a347c Make the systemui process persistent. 
This ensures that the system won't kill it for memory,
the user can't stop services inside of it, etc.

Change-Id: I923c376afa1133bccc000253f5bba851f9119a52
 2010-07-30 17:24:38 -07:00
Adam Powell
26fda2340a Merge "Add action mode decor to layout.screen_simple" 2010-07-30 17:14:52 -07:00
Chet Haase
4de823a759 Merge "Fix problems with moving Views around (invalidation, conflict with layout)" 2010-07-30 17:14:29 -07:00
Kenny Root
98b557de31 am 9117669c: am 8b61b68b: Merge "Only install after MCS success" into gingerbread 
Merge commit '9117669c7de41799535dfa88e5d68a30d7674733'

* commit '9117669c7de41799535dfa88e5d68a30d7674733':
  Only install after MCS success
 2010-07-30 17:03:51 -07:00
Kenny Root
9117669c7d am 8b61b68b: Merge "Only install after MCS success" into gingerbread 
Merge commit '8b61b68b648985df37197de204398f608c4ad8b1' into gingerbread-plus-aosp

* commit '8b61b68b648985df37197de204398f608c4ad8b1':
  Only install after MCS success
 2010-07-30 17:00:01 -07:00
Kenny Root
8b61b68b64 Merge "Only install after MCS success" into gingerbread 2010-07-30 16:55:37 -07:00
Kenny Root
6f89fa07b4 Only install after MCS success 
If MCS dies in the middle of a call during install, only proceed if the
call was successful. Otherwise wait for the max retries to be reached
and run the failure handling code there.

Change-Id: I00a27ea91046ea6521a3cff5e5ffe2c71b2b5bb4
 2010-07-30 16:35:04 -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
Dirk Dougherty
2ff1ba012c Doc change: Cleanup for licensing doc. 
Change-Id: Iff046768d70adf0489f5241212061045cef2572f
 2010-07-30 16:00:18 -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