Commit Graph

29934 Commits

Author SHA1 Message Date
Romain Guy
ecc5d4b2cd am 44e3b0d0: am f44ed5ad: Merge "Don\'t clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433" into honeycomb
* commit '44e3b0d0344955d5ce1bbb0b329627e24b7dd468':
  Don't clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433
2011-02-02 17:15:26 -08:00
Vasu Nori
ba45e29577 am 99e8e047: am 6bc710f7: Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb
* commit '99e8e0470249ce145003cc1eabc5ae391af34a06':
  bug:3414192 new API to designate a download to be OTA update
2011-02-02 17:15:16 -08:00
Kenny Root
2402adb8f9 Merge "Fix some memory leaks found in static analysis" 2011-02-02 17:14:35 -08:00
Scott Main
7f72086ffc am 45c66a0e: (-s ours) am 94a6c689: Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread
* commit '45c66a0e1ce3d38c20804caaa6cda896187d88fb':
  wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed
2011-02-02 17:02:53 -08:00
Romain Guy
5328f85d57 am f44ed5ad: Merge "Don\'t clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433" into honeycomb
* commit 'f44ed5adc42fefa0c91fc79c5e3c20e1cdc7d697':
  Don't clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433
2011-02-02 16:47:09 -08:00
Vasu Nori
969cc51afb am 6bc710f7: Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb
* commit '6bc710f769618e87b98d51cd02241e6b1a2fb653':
  bug:3414192 new API to designate a download to be OTA update
2011-02-02 16:47:05 -08:00
Mathias Agopian
48840800f4 am 50b029d5: am 7ba35f5a: Merge "[3418265] apply layer transformations to the DimLayer." into honeycomb
* commit '50b029d578fa06cd0733dcc7c69cb94f5f824908':
  [3418265] apply layer transformations to the DimLayer.
2011-02-02 16:46:46 -08:00
Scott Main
5fced2b267 am 8007af91: am 603b475e: am 4add7f3f: cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
* commit '8007af91ed229936dee24f3b8b7f76abd5598502':
  cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
2011-02-02 16:46:42 -08:00
Mathias Agopian
75efa55144 am 7ba35f5a: Merge "[3418265] apply layer transformations to the DimLayer." into honeycomb
* commit '7ba35f5ab3c838c7f1b3ab957be685ac1f506b2a':
  [3418265] apply layer transformations to the DimLayer.
2011-02-02 16:44:58 -08:00
Scott Main
cf30ff9ff3 am 94a6c689: Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread
* commit '94a6c689acb03ba01546a10933699bde22bb4a4c':
  wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed
2011-02-02 16:44:55 -08:00
Scott Main
1a61e5800c am 603b475e: am 4add7f3f: cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
* commit '603b475e59d0ebcdb9bac297fc91e80cafbdb3a9':
  cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
2011-02-02 16:44:13 -08:00
Romain Guy
e50ee1e79d Merge "Don't clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433" into honeycomb 2011-02-02 16:44:07 -08:00
Vasu Nori
70c6fb0d8b Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb 2011-02-02 16:43:56 -08:00
Mathias Agopian
057a8137c6 Merge "[3418265] apply layer transformations to the DimLayer." into honeycomb 2011-02-02 16:42:37 -08:00
Robert Greenwalt
2cc15f0af8 Merge "Add new network type for HSPA+." 2011-02-02 16:42:10 -08:00
Scott Main
a81c478037 am 4add7f3f: cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
* commit '4add7f3ffcebe1564d1e492194817afaf107ac16':
  cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
2011-02-02 16:41:29 -08:00
Scott Main
eba0a98abd Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread 2011-02-02 16:38:25 -08:00
Bill Gruber
4a01cdda4c am a9b9e3f7: am 930189f0: am df71cabb: cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
* commit 'a9b9e3f7a955888c44ecfba6cf29c420862976d2':
  cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
2011-02-02 16:25:26 -08:00
Scott Main
00313e0c24 am 44ebca2a: am cb2d8817: am 2458f2a1: cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
* commit '44ebca2a3d994630e6d500725d86aab391d1d879':
  cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
2011-02-02 16:25:23 -08:00
Scott Main
867081d670 am 062f2c4e: am 8b05f6a2: am 0c1a4d3b: cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
* commit '062f2c4e22b2d38d9d8983beb14d7363607177ff':
  cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
2011-02-02 16:22:12 -08:00
Irfan Sheriff
27aa556358 am aec39e62: Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit 'aec39e625b95088f4020302a0eac1f38da43c765':
  two digit number handling in croatia and serbia
2011-02-02 16:21:28 -08:00
Jamie Gennis
08b4ea31a8 am 421d94c2: am ecb4b3f0: Merge "Pass the IGraphicBufferAlloc to SurfaceTextureClient." into honeycomb
* commit '421d94c20321e1de528416b279bf148baba47b39':
  Pass the IGraphicBufferAlloc to SurfaceTextureClient.
2011-02-02 16:21:24 -08:00
Wink Saville
fda9203c54 am 94dbc990: am d31fed90: Merge "Have SmsMessage use getCurrentPhoneType" into honeycomb
* commit '94dbc990b8840d323d358770a1ba02bb4820c681':
  Have SmsMessage use getCurrentPhoneType
2011-02-02 16:21:08 -08:00
Xavier Ducrohet
139272a6ab am ca2f84c8: am a4747d53: Merge "Make TimePicker/DatePicker/CalendarView render in Eclipse." into honeycomb
* commit 'ca2f84c8fc9135b6031de3c01b7f657a80223ceb':
  Make TimePicker/DatePicker/CalendarView render in Eclipse.
2011-02-02 16:21:02 -08:00
Dharmaray Kundargi
940ea82014 am 3d3621f0: am 54b0a7f3: Merge "Fix issue 3412777 ANR on adding effects." into honeycomb
* commit '3d3621f08b02ae559036c7d085c02276ae0a24d9':
  Fix issue 3412777 ANR on adding effects.
2011-02-02 16:20:56 -08:00
Leon Scroggins
a3339f8cef am 8287edd3: (-s ours) am 8257e4d7: Merge "DO NOT MERGE. Only scroll if the IME is open in certain cases." into honeycomb
* commit '8287edd3ae2362f01c4d3b9d76246dd15be54a11':
  DO NOT MERGE. Only scroll if the IME is open in certain cases.
2011-02-02 16:20:43 -08:00
Bill Gruber
3aacb20361 am 930189f0: am df71cabb: cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
* commit '930189f0f7c302dc76031d88f7a90f32bb57e7b6':
  cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
2011-02-02 16:18:18 -08:00
Scott Main
345c5a1f15 am cb2d8817: am 2458f2a1: cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
* commit 'cb2d88176565a199ad6c6a3a6360a166bd700579':
  cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
2011-02-02 16:18:11 -08:00
Scott Main
2a752e7e90 am 8b05f6a2: am 0c1a4d3b: cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
* commit '8b05f6a2af3b12fd92991feb4a32a9a252d7d7c6':
  cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
2011-02-02 16:10:29 -08:00
Robert Ly
eebca4cdf8 resolved conflicts for merge of c0b3ba83 to master
Change-Id: I9358b1b6f200cb41740bc4243f9ab65b3e76bd99
2011-02-02 16:08:23 -08:00
Mathias Agopian
bce26daaaf [3418265] apply layer transformations to the DimLayer.
with this change DimLayers will behave just like any other layer,
in particular they'll respect the layer transformations.

Change-Id: Icb4a1275e8bca9e3deb5f57c9f9219aaa69f9877
2011-02-02 16:05:39 -08:00
Irfan Sheriff
9b21e21661 Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-02-02 16:03:29 -08:00
Irfan Sheriff
c8f4b619dd resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp
Change-Id: I34d034115362f0f858fb65710165bd6cad2fdbd5
2011-02-02 16:02:37 -08:00
Jamie Gennis
d7a3ebe031 am ecb4b3f0: Merge "Pass the IGraphicBufferAlloc to SurfaceTextureClient." into honeycomb
* commit 'ecb4b3f02340e21eefabbea78559e85ec7ee0089':
  Pass the IGraphicBufferAlloc to SurfaceTextureClient.
2011-02-02 15:56:20 -08:00
Jamie Gennis
1472b3a885 Merge "Pass the IGraphicBufferAlloc to SurfaceTextureClient." into honeycomb 2011-02-02 15:53:33 -08:00
Wink Saville
e733ccfe20 am d31fed90: Merge "Have SmsMessage use getCurrentPhoneType" into honeycomb
* commit 'd31fed90f8fdf854cade08af94918066af921d74':
  Have SmsMessage use getCurrentPhoneType
2011-02-02 15:52:51 -08:00
Xavier Ducrohet
e4e7344403 am a4747d53: Merge "Make TimePicker/DatePicker/CalendarView render in Eclipse." into honeycomb
* commit 'a4747d536e905c3c34ab0d3c1c9c7485d6fac689':
  Make TimePicker/DatePicker/CalendarView render in Eclipse.
2011-02-02 15:52:18 -08:00
Dharmaray Kundargi
3a087d1b3e am 54b0a7f3: Merge "Fix issue 3412777 ANR on adding effects." into honeycomb
* commit '54b0a7f3ff0411a215e7e23f1041d414a32147b5':
  Fix issue 3412777 ANR on adding effects.
2011-02-02 15:52:05 -08:00
Leon Scroggins
67cc2ff154 am 8257e4d7: Merge "DO NOT MERGE. Only scroll if the IME is open in certain cases." into honeycomb
* commit '8257e4d7e2b1ac9b8310a326cf8f4b53aba760ec':
  DO NOT MERGE. Only scroll if the IME is open in certain cases.
2011-02-02 15:52:00 -08:00
Bill Gruber
22616680c7 am df71cabb: cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
* commit 'df71cabbc2f670a4acea91e04f54990a472a56e9':
  cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
2011-02-02 15:46:52 -08:00
Scott Main
599a6ea28d am 2458f2a1: cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
* commit '2458f2a1ccf13a9f33c21d8aff260baefac9edb8':
  cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
2011-02-02 15:44:29 -08:00
Jamie Gennis
1b20cde313 Pass the IGraphicBufferAlloc to SurfaceTextureClient.
This change passes a reference to the IGraphicBufferAlloc binder object
to SurfaceTextureClient objects.  When STC objects are created they
query their associated ISurfaceTexture object for the
IGraphicBufferAlloc that the SurfaceTexture uses to allocate buffers.
Having the SurfaceTextureClient hold this reference prevents the
GraphicBufferAlloc in SurfaceFlinger from freeing the allocated buffers
before the SurfaceTextureClient is done with them.

Change-Id: Ib8e30e8b37fdd60438cbb4cb7e9174d0ba6d661c
related-bug: 3362519
2011-02-02 15:31:47 -08:00
Scott Main
7238bb6b1a am 0c1a4d3b: cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
* commit '0c1a4d3b51337784583ef39378ca8796bb8b0992':
  cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
2011-02-02 15:16:13 -08:00
Wink Saville
29e384d850 Merge "Have SmsMessage use getCurrentPhoneType" into honeycomb 2011-02-02 15:06:58 -08:00
Irfan Sheriff
22e78eb934 resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp
Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c
2011-02-02 14:23:10 -08:00
Xavier Ducrohet
13b0abe05b Merge "Make TimePicker/DatePicker/CalendarView render in Eclipse." into honeycomb 2011-02-02 14:15:39 -08:00
Robert Ly
92f7e3e32d resolved conflicts for merge of f8cc65c4 to honeycomb-plus-aosp
Change-Id: I407df4448a126a39128f3e24232c166be2625e14
2011-02-02 14:04:20 -08:00
Dharmaray Kundargi
4e444e8e9a Merge "Fix issue 3412777 ANR on adding effects." into honeycomb 2011-02-02 13:56:49 -08:00
Leon Scroggins
497b7b8ab8 Merge "DO NOT MERGE. Only scroll if the IME is open in certain cases." into honeycomb 2011-02-02 13:41:19 -08:00
Robert Ly
3192a752d2 Merge "Doc change: fixing broken links/images" into honeycomb 2011-02-02 13:36:47 -08:00