Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,284 Commits 3 Branches 0 Tags
e7d35eb56e7c854f1d0ef2320c39f7635de14f8a
Commit Graph

16284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Git Automerger
e7d35eb56e Merge commit 'goog/eclair-plus-aosp' 2009-12-15 00:44:42 -08:00
Android (Google) Code Review
5dd27cbc18 Merge change I11fbdf50 
* changes:
  Remove check for surface valid that is no longer valid.
 2009-12-14 19:21:28 -08:00
Jason Sams
11fbdf5020 Remove check for surface valid that is no longer valid. 2009-12-14 19:20:30 -08:00
Romain Guy
089e36f96e Bump ViewServer version number from 2 to 3 2009-12-14 18:54:33 -08:00
Android (Google) Code Review
da1807fccb Merge change I236092a3 
* changes:
  Fixes crash in HierarchyViewer when windows hash code exceed int capacity. Bug: 2321018
 2009-12-14 17:57:43 -08:00
Paul Westbrook
3f6f6807e5 Fixed bad merge in preloaded-classes 2009-12-14 16:54:34 -08:00
Kenny Root
781d10991f am 451c850f: am 15f1bfb0: Merge change I70d0bddb into eclair-mr2 
Merge commit '451c850fd60aca5372810a5413636fda25d93438'

* commit '451c850fd60aca5372810a5413636fda25d93438':
  Revise aapt options for UTF8/16 encoding
 2009-12-14 16:32:08 -08:00
Kenny Root
451c850fd6 am 15f1bfb0: Merge change I70d0bddb into eclair-mr2 
Merge commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0' into eclair-mr2-plus-aosp

* commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0':
  Revise aapt options for UTF8/16 encoding
 2009-12-14 16:28:03 -08:00
Android (Google) Code Review
15f1bfb0d2 Merge change I70d0bddb into eclair-mr2 
* changes:
  Revise aapt options for UTF8/16 encoding
 2009-12-14 16:24:32 -08:00
Romain Guy
236092a362 Fixes crash in HierarchyViewer when windows hash code exceed int capacity. 
Bug: 2321018
 2009-12-14 16:20:01 -08:00
Dianne Hackborn
74a76d5e07 am 83652ebf: am 3a3fd2ba: Merge change Iaf1f0918 into eclair-mr2 
Merge commit '83652ebfe1963bcecdcf24383165904223baca6e'

* commit '83652ebfe1963bcecdcf24383165904223baca6e':
  Implement API to have new broadcasts replace existing broadcasts.
 2009-12-14 16:15:03 -08:00
Dianne Hackborn
83652ebfe1 am 3a3fd2ba: Merge change Iaf1f0918 into eclair-mr2 
Merge commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e' into eclair-mr2-plus-aosp

* commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e':
  Implement API to have new broadcasts replace existing broadcasts.
 2009-12-14 16:10:13 -08:00
Android (Google) Code Review
3a3fd2ba1f Merge change Iaf1f0918 into eclair-mr2 
* changes:
  Implement API to have new broadcasts replace existing broadcasts.
 2009-12-14 16:06:49 -08:00
Andreas Huber
9661066886 am 08e2106a: am 67f1db1c: Merge change Ib1f5ee41 into eclair-mr2 
Merge commit '08e2106a19a034670287374d96d671495e4ffc5f'

* commit '08e2106a19a034670287374d96d671495e4ffc5f':
  It's important that seek requests are only specified in the initial call to MediaSource::read and are not repeated in subsequent calls.
 2009-12-14 15:59:05 -08:00
Andreas Huber
08e2106a19 am 67f1db1c: Merge change Ib1f5ee41 into eclair-mr2 
Merge commit '67f1db1cd1ed4af67c76c52542f753af57aa0a85' into eclair-mr2-plus-aosp

* commit '67f1db1cd1ed4af67c76c52542f753af57aa0a85':
  It's important that seek requests are only specified in the initial call to MediaSource::read and are not repeated in subsequent calls.
 2009-12-14 15:54:19 -08:00
Android (Google) Code Review
67f1db1cd1 Merge change Ib1f5ee41 into eclair-mr2 
* changes:
  It's important that seek requests are only specified in the initial call to MediaSource::read and are not repeated in subsequent calls.
 2009-12-14 15:48:48 -08:00
Paul Westbrook
26ca1a6d70 am b6ffc8f2: am 16396414: Merge change If5b0b6fa into eclair-mr2 
Merge commit 'b6ffc8f2535c38703e753cfc1535134b5976c4e1'

* commit 'b6ffc8f2535c38703e753cfc1535134b5976c4e1':
  Fixed class paths in layout xml files
 2009-12-14 15:35:19 -08:00
Andreas Huber
00cda269b5 am dc7294d9: am 19553241: Merge change I1314e737 into eclair-mr2 
Merge commit 'dc7294d94dba213727c1956774466707e58a8784'

* commit 'dc7294d94dba213727c1956774466707e58a8784':
  AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
 2009-12-14 15:35:07 -08:00
Andreas Huber
ee49747efa am 354cf967: am 0483f1c1: Merge change Ib5ae1c87 into eclair-mr2 
Merge commit '354cf96792196ce0fec358a573d2621ad2ab0788'

* commit '354cf96792196ce0fec358a573d2621ad2ab0788':
  The software AVCDecoder now properly seeks as requested.
 2009-12-14 15:34:55 -08:00
Dianne Hackborn
0836101256 am 48e1bd45: am 91afce93: am 9602d9ad: Fix issue #2325782 Missing location features 
Merge commit '48e1bd45e2e4d1dda075aad26aea9ea16a597d49'

* commit '48e1bd45e2e4d1dda075aad26aea9ea16a597d49':
  Fix issue #2325782 Missing location features
 2009-12-14 15:34:39 -08:00
Eric Laurent
64c6902c1b am 2cb1fe2f: am 59e03a0a: am da4cc343: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72). 
Merge commit '2cb1fe2f407d438544efd497e2cfbda1f6d58d75'

* commit '2cb1fe2f407d438544efd497e2cfbda1f6d58d75':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
 2009-12-14 15:34:28 -08:00
Andreas Huber
b1f5ee41e9 It's important that seek requests are only specified in the initial call to MediaSource::read and are not repeated in subsequent calls. 2009-12-14 15:34:11 -08:00
Maryam Garrett
9021b37a9b am 50fbfe65: am 39f0efba: Fixes context-menu trigger behavior after scroll in TextView 
Merge commit '50fbfe65bb78e9fbd809238ca1f358390ed61ad3'

* commit '50fbfe65bb78e9fbd809238ca1f358390ed61ad3':
  Fixes context-menu trigger behavior after scroll in TextView
 2009-12-14 15:34:03 -08:00
Paul Westbrook
b6ffc8f253 am 16396414: Merge change If5b0b6fa into eclair-mr2 
Merge commit '163964143fe27b7fdbeb51a4fc65d72769c83481' into eclair-mr2-plus-aosp

* commit '163964143fe27b7fdbeb51a4fc65d72769c83481':
  Fixed class paths in layout xml files
 2009-12-14 15:29:46 -08:00
Ken Shirriff
1634d93625 am f30a19aa: am ba8e4d24: Merge change Ib5343691 into eclair-mr2 
Merge commit 'f30a19aaaf586e17dee510cf2b056fa7402fe08c'

* commit 'f30a19aaaf586e17dee510cf2b056fa7402fe08c':
  Add account name / type query parameters for calendar Events.
 2009-12-14 15:29:37 -08:00
Andreas Huber
dc7294d94d am 19553241: Merge change I1314e737 into eclair-mr2 
Merge commit '19553241513bd2ee2610026ebbce8c45c7ae0dbc' into eclair-mr2-plus-aosp

* commit '19553241513bd2ee2610026ebbce8c45c7ae0dbc':
  AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
 2009-12-14 15:27:01 -08:00
Andreas Huber
354cf96792 am 0483f1c1: Merge change Ib5ae1c87 into eclair-mr2 
Merge commit '0483f1c192201f75f7c2bd9b22cb6680801dabbb' into eclair-mr2-plus-aosp

* commit '0483f1c192201f75f7c2bd9b22cb6680801dabbb':
  The software AVCDecoder now properly seeks as requested.
 2009-12-14 15:26:55 -08:00
Dianne Hackborn
48e1bd45e2 am 91afce93: am 9602d9ad: Fix issue #2325782 Missing location features 
Merge commit '91afce93866a5fb1bafbd3407d6bc1806caf8c41' into eclair-mr2-plus-aosp

* commit '91afce93866a5fb1bafbd3407d6bc1806caf8c41':
  Fix issue #2325782 Missing location features
 2009-12-14 15:26:48 -08:00
Eric Laurent
2cb1fe2f40 am 59e03a0a: am da4cc343: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72). 
Merge commit '59e03a0a4d62f214cf5cfab49f16223f89670f2a' into eclair-mr2-plus-aosp

* commit '59e03a0a4d62f214cf5cfab49f16223f89670f2a':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
 2009-12-14 15:26:41 -08:00
Maryam Garrett
50fbfe65bb am 39f0efba: Fixes context-menu trigger behavior after scroll in TextView 
Merge commit '39f0efba92a4420f77e3abc53c367ea3cacde3cf' into eclair-mr2-plus-aosp

* commit '39f0efba92a4420f77e3abc53c367ea3cacde3cf':
  Fixes context-menu trigger behavior after scroll in TextView
 2009-12-14 15:26:33 -08:00
Android (Google) Code Review
163964143f Merge change If5b0b6fa into eclair-mr2 
* changes:
  Fixed class paths in layout xml files
 2009-12-14 15:17:24 -08:00
Dianne Hackborn
1c633fc89b Implement API to have new broadcasts replace existing broadcasts. 
Use this in various places where it should serve no purpose to deliver
both broadcasts.  This is intended to reduce somewhat the flurry of
broadcasts that we churn through during boot.
 2009-12-14 15:03:35 -08:00
Paul Westbrook
4ee9e53837 Fixed class paths in layout xml files 
Updated the class paths in some layout files to match the package of
the NumberPicker and NumberPickerButton
 2009-12-14 14:54:01 -08:00
Android (Google) Code Review
6015f4e0fc Merge change I3b7d39bb 
* changes:
  Implement RS tracked defered texture and buffer object uploads.
 2009-12-14 14:32:48 -08:00
Android (Google) Code Review
1955324151 Merge change I1314e737 into eclair-mr2 
* changes:
  AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
 2009-12-14 14:32:13 -08:00
Andreas Huber
1314e73786 AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library. 2009-12-14 14:18:22 -08:00
Jason Sams
3b7d39bb51 Implement RS tracked defered texture and buffer object uploads. 2009-12-14 12:59:49 -08:00
Android (Google) Code Review
0483f1c192 Merge change Ib5ae1c87 into eclair-mr2 
* changes:
  The software AVCDecoder now properly seeks as requested.
 2009-12-14 12:34:16 -08:00
Dianne Hackborn
bdcb2b71bd am 9602d9ad: Fix issue #2325782 Missing location features 
Merge commit '9602d9adf456410a5bfc4268f55adc1b7ab0efa8' into eclair-plus-aosp

* commit '9602d9adf456410a5bfc4268f55adc1b7ab0efa8':
  Fix issue #2325782 Missing location features
 2009-12-14 11:59:30 -08:00
Dianne Hackborn
91afce9386 am 9602d9ad: Fix issue #2325782 Missing location features 
Merge commit '9602d9adf456410a5bfc4268f55adc1b7ab0efa8' into eclair-mr2

* commit '9602d9adf456410a5bfc4268f55adc1b7ab0efa8':
  Fix issue #2325782 Missing location features
 2009-12-14 11:59:10 -08:00
Eric Laurent
2685607d59 am da4cc343: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72). 
Merge commit 'da4cc34308d65730c404b669926a92e37b378555' into eclair-plus-aosp

* commit 'da4cc34308d65730c404b669926a92e37b378555':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
 2009-12-14 11:57:42 -08:00
Eric Laurent
59e03a0a4d am da4cc343: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72). 
Merge commit 'da4cc34308d65730c404b669926a92e37b378555' into eclair-mr2

* commit 'da4cc34308d65730c404b669926a92e37b378555':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
 2009-12-14 11:57:24 -08:00
Ken Shirriff
f30a19aaaf am ba8e4d24: Merge change Ib5343691 into eclair-mr2 
Merge commit 'ba8e4d240b3d5eaebbdba9351b247ac20bedadc5' into eclair-mr2-plus-aosp

* commit 'ba8e4d240b3d5eaebbdba9351b247ac20bedadc5':
  Add account name / type query parameters for calendar Events.
 2009-12-14 11:50:09 -08:00
Maryam Garrett
39f0efba92 Fixes context-menu trigger behavior after scroll in TextView 
This change fixes the context menu trigger behavior while
the user is selecting via touch. How if a user is selecting
text via dragging their finger, to trigger the context menu
they will have to lift their finger up, then issue a
longpress. This is consistent with the behavior of selecting
via the trackball.
 2009-12-14 14:42:25 -05:00
Dianne Hackborn
9602d9adf4 Fix issue #2325782 Missing location features 
Change-Id: I56a07438b5840f530f7508b1ef4904cea737a550
 2009-12-14 11:00:40 -08:00
Paul Westbrook
e143bc92b2 resolved conflicts for merge of 15d3bb2c to master 2009-12-14 10:56:45 -08:00
Andreas Huber
b5ae1c8712 The software AVCDecoder now properly seeks as requested. 2009-12-14 10:54:10 -08:00
Android (Google) Code Review
ba8e4d240b Merge change Ib5343691 into eclair-mr2 
* changes:
  Add account name / type query parameters for calendar Events.
 2009-12-14 10:41:33 -08:00
Paul Westbrook
15d3bb2ce6 am 7762d936: Unbundling work 
Merge commit '7762d93621f508f4410fd37b5bbdfec0071b0420' into eclair-mr2-plus-aosp

* commit '7762d93621f508f4410fd37b5bbdfec0071b0420':
  Unbundling work
 2009-12-14 10:10:20 -08:00
Paul Westbrook
7762d93621 Unbundling work 
Moved AndroidHttpClient, Rfc822InputFilter, Rfc822Validator
NumberPicker, NumberPickerButton to android-common
---
 2009-12-14 09:24:09 -08:00