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

28512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitri Plotnikov
3e4b7c332f Keep the '+' when normalizing the phone number 
Change-Id: I24731735ed18dbc92a643a0d99d35a1b58be40c8
 2010-08-13 11:09:29 -07:00
Maksymilian Osowski
aba188523c Merge "Added copyright information to the files that were missing it." 2010-08-13 10:23:52 -07:00
Jean-Baptiste Queru
72dc780f57 Fix build: tweak documentation links 
Change-Id: I9c9c8615086b7173f4ad68b5183e7699275c7a2d
 2010-08-13 09:25:19 -07:00
Maksymilian Osowski
073d2c9aa9 Added copyright information to the files that were missing it. 
Change-Id: I3b814f2fbd96384189e702e723764d17cbbde5fe
 2010-08-13 17:12:51 +01:00
Ben Murdoch
3778a632a0 Merge "Merge WebKit at r65072 : Update DRT ignore list." 2010-08-13 05:20:08 -07:00
Ben Murdoch
713ad437d6 Merge "Merge WebKit at r65072 : Update User Agent string with new webkit version." 2010-08-13 05:19:53 -07:00
Ben Murdoch
e7611352ae Merge WebKit at r65072 : Update DRT ignore list. 
This merge introduces two new Geolocation tests that to pass we need
a new LayoutTestController function. We ignore those tests until this
function is added - see b/2914450

Change-Id: If13dda2caa467b771d4a21d60463319019cc7679
 2010-08-13 13:18:41 +01:00
Ben Murdoch
bb3ed52803 Merge WebKit at r65072 : Update User Agent string with new webkit version. 
Change-Id: I3bbb4b10ae54387c7237410981f3da5a599a04d0
 2010-08-13 13:18:41 +01:00
Maksymilian Osowski
71e1a7aa5e Merge "Added python script that starts/stops apache2 server on host machine configured to handle http layout tests." 2010-08-13 05:18:20 -07:00
Maksymilian Osowski
74b13aecbe Added python script that starts/stops apache2 server on host machine configured to handle http layout tests. 
Change-Id: I7bf4390dfb4f9a580e6e4ca0eb25c85655df723c
 2010-08-13 12:07:17 +01:00
Erik Gilling
0cf2f4354b surfaceflinger: don't check HWComposer numLayers unless one exists 
Change-Id: I6524f46910b761cff3ef696edf5a65a424879faa
 2010-08-12 23:21:40 -07:00
Dmitri Plotnikov
eb7845e672 Merge "Adding query-based aggregation suggestions" 2010-08-12 18:35:28 -07:00
John Wang
c178b95c1f am 2835391c: am 686a9505: Merge "Update switch call and accept call." into gingerbread 
Merge commit '2835391c1709a2b655940200dab0fc74ef08512d'

* commit '2835391c1709a2b655940200dab0fc74ef08512d':
  Update switch call and accept call.
 2010-08-12 17:35:53 -07:00
John Wang
2835391c17 am 686a9505: Merge "Update switch call and accept call." into gingerbread 
Merge commit '686a95055896c221c62fe7f4c3dda137809df91e' into gingerbread-plus-aosp

* commit '686a95055896c221c62fe7f4c3dda137809df91e':
  Update switch call and accept call.
 2010-08-12 17:33:19 -07:00
John Wang
686a950558 Merge "Update switch call and accept call." into gingerbread 2010-08-12 17:30:38 -07:00
Dianne Hackborn
b7a2e47722 Fragment and PreferenceFragment and FragmentManager, oh my! 
- Introduce FragmentManager public API, for all Fragment management
  needs.  Will in the future allow the removal of the (growing number
  of) fragment APIs on Activity.

- Fragment now has a concept of arguments.  This can be supplied
  immediately after creation, and are retained across instances.

- PreferenceActivity now has an API to have it update its headers (note
  not tested).  Headers now have arguments.  Keys for controlling
  when PreferenceActivity shows at launch have been added to the SDK.

- Fixes to back stack handling and state saving/restoring.

Change-Id: Ib9d07ae2beb296c4eb3a4d9e1b3b59544675e819
 2010-08-12 17:23:48 -07:00
James Dong
67dfaec8cf am 38a9f405: am e95d192f: Mainly fix two mistakes that I made: 
Merge commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f'

* commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f':
  Mainly fix two mistakes that I made:
 2010-08-12 17:05:28 -07:00
Jason Sams
4e806c596f Merge "Start adding RS tests." 2010-08-12 17:03:47 -07:00
James Dong
38a9f4050a am e95d192f: Mainly fix two mistakes that I made: 
Merge commit 'e95d192fae5a80ed821c53bfea214a85ea395e90' into gingerbread-plus-aosp

* commit 'e95d192fae5a80ed821c53bfea214a85ea395e90':
  Mainly fix two mistakes that I made:
 2010-08-12 17:02:42 -07:00
Jason Sams
2a114bdc64 Start adding RS tests. 
Change-Id: I025357407eca3e515823493ff63e4c78249e8126
 2010-08-12 17:00:09 -07:00
Jason Sams
2a115d8422 Merge "Thread launch strategies." 2010-08-12 16:59:18 -07:00
Mike Dodd
bf19bce301 am 2f020449: am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread 
Merge commit '2f02044944d5c526020d4e8cceaae7e77382d56d'

* commit '2f02044944d5c526020d4e8cceaae7e77382d56d':
  Support getting codec, width, and height in URL for gtalk playback.
 2010-08-12 16:50:39 -07:00
Eric Fischer
3065eb1b72 Merge "Import revised translations." 2010-08-12 16:48:41 -07:00
Mike Dodd
2f02044944 am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread 
Merge commit '5f96138ba65cecf38d0c752d87ad47d931db8775' into gingerbread-plus-aosp

* commit '5f96138ba65cecf38d0c752d87ad47d931db8775':
  Support getting codec, width, and height in URL for gtalk playback.
 2010-08-12 16:47:52 -07:00
James Dong
e95d192fae Mainly fix two mistakes that I made: 
1. When the ERROR_END_OF_STREAM is returned from read, the input buffer is not initialized
   release it would lead to crash

2. The mPrevTimestampUs is not initialized and thus fail in the CHECK(mPrevTimestampUs, timeUs)

Change-Id: Id1e51575fb8b3ca48e80547efd3a3a82dfac773b
 2010-08-12 16:47:17 -07:00
Mike Dodd
5f96138ba6 Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread 2010-08-12 16:45:19 -07:00
Eric Fischer
3d173c3040 Import revised translations. 
Change-Id: I0b89d1baf9ed02c492e8845f45fad1bee56e8d56
 2010-08-12 16:44:07 -07:00
Andreas Huber
0e8e269d29 am 73af0a92: am 72ac1f26: Fix software avc encoder crash at EOS. 
Merge commit '73af0a9211d0c4be663d287cefd9bf35746db1ba'

* commit '73af0a9211d0c4be663d287cefd9bf35746db1ba':
  Fix software avc encoder crash at EOS.
 2010-08-12 16:20:56 -07:00
Andreas Huber
73af0a9211 am 72ac1f26: Fix software avc encoder crash at EOS. 
Merge commit '72ac1f26d73bd8e7645365d8d8374fac7a511263' into gingerbread-plus-aosp

* commit '72ac1f26d73bd8e7645365d8d8374fac7a511263':
  Fix software avc encoder crash at EOS.
 2010-08-12 16:18:19 -07:00
Andreas Huber
72ac1f26d7 Fix software avc encoder crash at EOS. 
Change-Id: I738dc24556e41ce518b67babeff16cd934c2d1b1
 2010-08-12 16:14:29 -07:00
Mike Dodd
8741dfacf2 Support getting codec, width, and height in URL for gtalk playback. 
Format is rtsp://gtalk/codec/width/height

For example:
  rtsp://gtalk/H263-1998/320/200

Change-Id: If7c73fea1e1d0de89b22a8f0d12acba1c862d6fe
 2010-08-12 16:04:35 -07:00
Romain Guy
e0b8d3cbf7 Merge "Fix GC issue, fix local shader transformations." 2010-08-12 15:37:33 -07:00
Romain Guy
0ba681bce1 Fix GC issue, fix local shader transformations. 
Change-Id: I208bdf89815dcd18dcadd43df932a77362918435
 2010-08-12 15:37:00 -07:00
Mathias Agopian
6a3c9a96f8 am 1f432b19: am b7d1be01: Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread 
Merge commit '1f432b19203b86a2b4da825943024c5b01eaeb60'

* commit '1f432b19203b86a2b4da825943024c5b01eaeb60':
  Fix a couple issues with the new hwcomposer HAL
 2010-08-12 15:13:13 -07:00
Mathias Agopian
1f432b1920 am b7d1be01: Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread 
Merge commit 'b7d1be01ae44428b947823fc48c1c126dcaa9732' into gingerbread-plus-aosp

* commit 'b7d1be01ae44428b947823fc48c1c126dcaa9732':
  Fix a couple issues with the new hwcomposer HAL
 2010-08-12 15:09:30 -07:00
Adam Powell
62f2c1f5d3 Merge "Cleanup on CL 61012" 2010-08-12 15:08:29 -07:00
Mathias Agopian
b7d1be01ae Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread 2010-08-12 15:07:29 -07:00
Mathias Agopian
f8e705dea4 Fix a couple issues with the new hwcomposer HAL 
- we now clear the framebuffer upon request from the HAL
- the HAL list size could get out of sync with reality
- there was also an issue where sometime we could run past the list

Change-Id: Ic3a34314aed24181f2d8cc787096af83c046ef27
 2010-08-12 15:03:26 -07:00
John Wang
c159c84699 Update switch call and accept call. 
Change-Id: Ifdd1af77e3eca08f6c931605ecfb275835b78709
 2010-08-12 14:52:39 -07:00
Trevor Johns
c3deee13a2 am 1ef758b8: am 404bffbe: am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo 
Merge commit '1ef758b817ba225dbb9005b6def7d8d47ccdfe15'

* commit '1ef758b817ba225dbb9005b6def7d8d47ccdfe15':
  Fix subscribe links for Developer Forums doc.
 2010-08-12 14:36:35 -07:00
Romain Guy
6675f26c56 Merge "Better support for rotation and perspective matrices." 2010-08-12 14:35:24 -07:00
Romain Guy
af28b51496 Better support for rotation and perspective matrices. 
Change-Id: I56b5ae3321735ba5ee42aafc9bc0eb399b9e75b5
 2010-08-12 14:34:44 -07:00
Trevor Johns
1ef758b817 am 404bffbe: am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo 
Merge commit '404bffbeabbfa8c3f95cd92856d015a4d36e8a60' into gingerbread-plus-aosp

* commit '404bffbeabbfa8c3f95cd92856d015a4d36e8a60':
  Fix subscribe links for Developer Forums doc.
 2010-08-12 14:33:33 -07:00
Trevor Johns
404bffbeab am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo 
Merge commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795' into gingerbread

* commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795':
  Fix subscribe links for Developer Forums doc.
 2010-08-12 14:30:11 -07:00
Trevor Johns
4f3c5372a5 Merge "Fix subscribe links for Developer Forums doc." into froyo 2010-08-12 14:27:33 -07:00
Ben Dodson
ff9ca9c2c5 Merge "Canonical representation of floating point constants" 2010-08-12 14:10:20 -07:00
Wu-cheng Li
fd83b2f92e am 77a473fb: am ccaa0028: Merge "Improve camera documentation." into gingerbread 
Merge commit '77a473fbcea0214832255af91e0a65d853757aae'

* commit '77a473fbcea0214832255af91e0a65d853757aae':
  Improve camera documentation.
 2010-08-12 14:07:59 -07:00
Wu-cheng Li
77a473fbce am ccaa0028: Merge "Improve camera documentation." into gingerbread 
Merge commit 'ccaa002848e9ef1ff232eee5babc9273599924af' into gingerbread-plus-aosp

* commit 'ccaa002848e9ef1ff232eee5babc9273599924af':
  Improve camera documentation.
 2010-08-12 14:05:56 -07:00
Wu-cheng Li
ccaa002848 Merge "Improve camera documentation." into gingerbread 2010-08-12 14:04:07 -07:00
Wu-cheng Li
699fe93979 Improve camera documentation. 
Change-Id: I3c9e5e6de5ce64b8d7d892483930238fa9cc247c
 2010-08-12 14:00:14 -07:00