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

23536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
686d9ff53c merge from open-source master 
Change-Id: Ic2b28b589d079cf3c9927ce9ad22bc5f9134e445
 2010-05-10 12:37:10 -07:00
James Dong
76017b809f am 98bb3eeb: am 4000e06e: Merge "Metadata construction optimization" into kraken 2010-05-10 11:37:00 -07:00
James Dong
98bb3eeb46 am 4000e06e: Merge "Metadata construction optimization" into kraken 2010-05-10 11:34:49 -07:00
James Dong
4000e06ef6 Merge "Metadata construction optimization" into kraken 2010-05-10 11:33:25 -07:00
Jean-Baptiste Queru
855a9e6d12 Merge "Include the API level 4 fields in the Parcel." 2010-05-10 11:14:01 -07:00
Robert Greenwalt
858510ca40 am 8ada6786: am da7bf206: am c8d1556f: am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo 2010-05-10 10:18:37 -07:00
Robert Greenwalt
8ada678695 am da7bf206: am c8d1556f: am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo 2010-05-10 10:17:13 -07:00
Robert Greenwalt
da7bf20608 am c8d1556f: am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo 
Merge commit 'c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4' into kraken

* commit 'c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4':
  String change to refer to wifi tether as hotspot
 2010-05-10 10:14:51 -07:00
Robert Greenwalt
c8d1556fb8 am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo 
Merge commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41' into froyo-plus-aosp

* commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41':
  String change to refer to wifi tether as hotspot
 2010-05-10 10:12:58 -07:00
Robert Greenwalt
b74a239fd2 Merge "String change to refer to wifi tether as hotspot" into froyo 2010-05-10 10:11:12 -07:00
Scott Main
e128d67264 am cd2fa84a: am 9d5b754b: am 717e135c: am 62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo 2010-05-10 10:02:20 -07:00
Scott Main
cd2fa84a7f am 9d5b754b: am 717e135c: am 62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo 2010-05-10 10:00:30 -07:00
Scott Main
9d5b754bce am 717e135c: am 62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo 
Merge commit '717e135c17239ff3dd0698eb82b26f8e8ade0d08' into kraken

* commit '717e135c17239ff3dd0698eb82b26f8e8ade0d08':
  docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc
 2010-05-10 09:58:30 -07:00
Scott Main
717e135c17 am 62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo 
Merge commit '62c28caee4a26e106134264f917bacef77438483' into froyo-plus-aosp

* commit '62c28caee4a26e106134264f917bacef77438483':
  docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc
 2010-05-10 09:56:43 -07:00
Dan Egnor
07704f1f66 am 6bff8df8: am 1a373db0: am 5610c287: am 7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo 2010-05-10 09:56:41 -07:00
Dirk Dougherty
4e664773be am 90d35cba: am 31e4f45e: am e4682e8a: am fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo 2010-05-10 09:56:30 -07:00
Scott Main
ba1d1060dd am 41f6d916: am 25d24061: am fe5921aa: am c4c42eef: docs: add default value and compatibility info for installLocation 2010-05-10 09:56:25 -07:00
Scott Main
d98da9cfbb am 2e9ec96d: am 3d3853a6: am d2f2a80e: am c6cb8a78: docs: revisions to the new resources doc based on editorial feedback plus some fixes to resource references and other misc revisions 2010-05-10 09:56:19 -07:00
Andreas Huber
6aa19bb7d2 am 23796f1e: am 248597ae: am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo 2010-05-10 09:56:11 -07:00
Mathias Agopian
5705a886c6 am ef474f3f: am 4cfc21ec: am 56aed6bd: am c69775d6: Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo 2010-05-10 09:56:00 -07:00
Dirk Dougherty
2d498fd57e am fe39ceff: am 47de84c3: am aff856d0: am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo 2010-05-10 09:55:54 -07:00
Scott Main
62c28caee4 Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo 2010-05-10 09:54:30 -07:00
Dan Egnor
6bff8df839 am 1a373db0: am 5610c287: am 7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo 2010-05-10 09:54:16 -07:00
Dirk Dougherty
90d35cba61 am 31e4f45e: am e4682e8a: am fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo 2010-05-10 09:54:11 -07:00
Scott Main
41f6d916b5 am 25d24061: am fe5921aa: am c4c42eef: docs: add default value and compatibility info for installLocation 2010-05-10 09:54:04 -07:00
Scott Main
2e9ec96d9e am 3d3853a6: am d2f2a80e: am c6cb8a78: docs: revisions to the new resources doc based on editorial feedback plus some fixes to resource references and other misc revisions 2010-05-10 09:53:59 -07:00
Andreas Huber
23796f1eb6 am 248597ae: am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo 2010-05-10 09:53:54 -07:00
Mathias Agopian
ef474f3fb6 am 4cfc21ec: am 56aed6bd: am c69775d6: Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo 2010-05-10 09:53:48 -07:00
Dirk Dougherty
fe39ceff08 am 47de84c3: am aff856d0: am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo 2010-05-10 09:53:40 -07:00
Dan Egnor
1a373db021 am 5610c287: am 7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo 
Merge commit '5610c2871b5a8abab081c9e209925e2f0f2e3966' into kraken

* commit '5610c2871b5a8abab081c9e209925e2f0f2e3966':
  Add unit test for passing thread priority & cgroup through Binder.
 2010-05-10 09:49:41 -07:00
Dirk Dougherty
31e4f45eba am e4682e8a: am fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo 
Merge commit 'e4682e8ae75d573c12ddabce13b8b5c39011a86f' into kraken

* commit 'e4682e8ae75d573c12ddabce13b8b5c39011a86f':
  Doc change: cherry-pick from master: Testing Android Applications document (concepts)
 2010-05-10 09:49:37 -07:00
Scott Main
25d2406176 am fe5921aa: am c4c42eef: docs: add default value and compatibility info for installLocation 
Merge commit 'fe5921aa7e4ed5a1de02259d4ac468b7b013fa83' into kraken

* commit 'fe5921aa7e4ed5a1de02259d4ac468b7b013fa83':
  docs: add default value and compatibility info for installLocation
 2010-05-10 09:49:34 -07:00
Scott Main
3d3853a618 am d2f2a80e: am c6cb8a78: docs: revisions to the new resources doc based on editorial feedback plus some fixes to resource references and other misc revisions 
Merge commit 'd2f2a80e9ff7f0b2229d921f24682d984e3b5673' into kraken

* commit 'd2f2a80e9ff7f0b2229d921f24682d984e3b5673':
  docs: revisions to the new resources doc based on editorial feedback
 2010-05-10 09:49:30 -07:00
Andreas Huber
248597ae64 am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo 
Merge commit '1707851090e6512a77247b0c260dd673ef687589' into kraken

* commit '1707851090e6512a77247b0c260dd673ef687589':
  A new OggExtractor/VorbisDecoder combo to support approximate seeking.
 2010-05-10 09:49:24 -07:00
Mathias Agopian
4cfc21ecd9 am 56aed6bd: am c69775d6: Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo 
Merge commit '56aed6bde0c52658d2cb1207c0cfe8ba0a764c59' into kraken

* commit '56aed6bde0c52658d2cb1207c0cfe8ba0a764c59':
  fix [2664345] Flash: Bad flicker at the end of a pinch zoom.
 2010-05-10 09:49:19 -07:00
Dirk Dougherty
47de84c359 am aff856d0: am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo 
Merge commit 'aff856d053ba239114e7f16d3cdd240a6d973f2f' into kraken

* commit 'aff856d053ba239114e7f16d3cdd240a6d973f2f':
  Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
 2010-05-10 09:49:13 -07:00
Dan Egnor
5610c2871b am 7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo 
Merge commit '7d16737668685b5b4e6158a6ff6f79a92ed3b4d9' into froyo-plus-aosp

* commit '7d16737668685b5b4e6158a6ff6f79a92ed3b4d9':
  Add unit test for passing thread priority & cgroup through Binder.
 2010-05-10 09:43:53 -07:00
Dirk Dougherty
e4682e8ae7 am fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo 
Merge commit 'fb70ffd993a9ec60c806b873014b2f0f6e874c77' into froyo-plus-aosp

* commit 'fb70ffd993a9ec60c806b873014b2f0f6e874c77':
  Doc change: cherry-pick from master: Testing Android Applications document (concepts)
 2010-05-10 09:43:50 -07:00
Scott Main
fe5921aa7e am c4c42eef: docs: add default value and compatibility info for installLocation 
Merge commit 'c4c42eef9a62846a152094d61987e6dd2728e417' into froyo-plus-aosp

* commit 'c4c42eef9a62846a152094d61987e6dd2728e417':
  docs: add default value and compatibility info for installLocation
 2010-05-10 09:43:47 -07:00
Scott Main
d2f2a80e9f am c6cb8a78: docs: revisions to the new resources doc based on editorial feedback plus some fixes to resource references and other misc revisions 
Merge commit 'c6cb8a78d03cda44a49a990b4d4153560bee7420' into froyo-plus-aosp

* commit 'c6cb8a78d03cda44a49a990b4d4153560bee7420':
  docs: revisions to the new resources doc based on editorial feedback
 2010-05-10 09:43:35 -07:00
Andreas Huber
1707851090 am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo 
Merge commit 'd13efb20089e44e6958cb9704864c03821f19e1c' into froyo-plus-aosp

* commit 'd13efb20089e44e6958cb9704864c03821f19e1c':
  A new OggExtractor/VorbisDecoder combo to support approximate seeking.
 2010-05-10 09:43:26 -07:00
Mathias Agopian
56aed6bde0 am c69775d6: Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo 
Merge commit 'c69775d616c25d31dcea119ab1e7af19148853e2' into froyo-plus-aosp

* commit 'c69775d616c25d31dcea119ab1e7af19148853e2':
  fix [2664345] Flash: Bad flicker at the end of a pinch zoom.
 2010-05-10 09:43:23 -07:00
Dirk Dougherty
aff856d053 am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo 
Merge commit '0dd3a239519369933d4efa701479c816b4b33874' into froyo-plus-aosp

* commit '0dd3a239519369933d4efa701479c816b4b33874':
  Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
 2010-05-10 09:43:03 -07:00
Jean-Baptiste Queru
0a26aaad8b Merge "long modifier was on the wrong argument." 2010-05-10 08:55:17 -07:00
Seth Pensack-Rinehart
b7332c714c Fix Javadoc typo for Spanned.SPAN_EXCLUSIVE_INCLUSIVE 
Change-Id: I82d15bde9444beca83eb78349212125cae525a6e
 2010-05-10 17:44:12 +09:00
Chih-Chung Chang
7439895058 am 979d5c9b: am dc3e2607: Force sooner/generic/sim to use camera stub only. 2010-05-10 00:19:20 -07:00
Chih-Chung Chang
979d5c9b7d am dc3e2607: Force sooner/generic/sim to use camera stub only. 2010-05-10 00:18:18 -07:00
Wu-cheng Li
ca09961484 Add continuous focus mode constant. 
bug:2612447
Change-Id: I9bc3f5a47ad50722a265d50b1d28fb82a2253dc9
 2010-05-10 15:14:56 +08:00
Chih-Chung Chang
dc3e260713 Force sooner/generic/sim to use camera stub only. 
Change-Id: Ie3251e3801cd09b3f373bbd4afb5fda82a0c5818
 2010-05-10 15:04:40 +08:00
Chih-Chung Chang
6200ef98e7 am 8f21d233: am 7768892c: Fix for build without a hardware camera. 2010-05-09 23:50:00 -07:00