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

47311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
0660c7d048 Merge "Add a release() method to MediaScanner" 2011-03-14 17:49:25 -07:00
Mike Lockwood
688d8412bd am 0958fb10: am 221830b9: Merge "Add support for USB accessory serial numbers" into honeycomb-mr1 
* commit '0958fb1068ee1b5e6c40eee16d943a664b1124b4':
  Add support for USB accessory serial numbers
 2011-03-14 17:47:49 -07:00
Shailendra Yadav
6c256d125e am e987cbaf: am 3fabad87: Merge "Fix for Don\'t allow adding 64-bit files(4086708)" into honeycomb-mr1 
* commit 'e987cbafc2a6c19cae1ccf50658fb6320bda084a':
  Fix for Don't allow adding 64-bit files(4086708)
 2011-03-14 17:41:53 -07:00
Gloria Wang
5c4421f73f am 67718e07: am 132bb659: Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1 
* commit '67718e076422f8f28f4e30a39df9e462ef32d19b':
  For issue 4082089 Add more info and error events into the DRM framework
 2011-03-14 17:41:42 -07:00
Mike Lockwood
0958fb1068 am 221830b9: Merge "Add support for USB accessory serial numbers" into honeycomb-mr1 
* commit '221830b93d6f35bcf20db2d34978392b43f44221':
  Add support for USB accessory serial numbers
 2011-03-14 17:41:22 -07:00
Mike Lockwood
221830b93d Merge "Add support for USB accessory serial numbers" into honeycomb-mr1 2011-03-14 17:39:43 -07:00
Shailendra Yadav
e987cbafc2 am 3fabad87: Merge "Fix for Don\'t allow adding 64-bit files(4086708)" into honeycomb-mr1 
* commit '3fabad87f6cade6ccf7dc6d716e8b91675982088':
  Fix for Don't allow adding 64-bit files(4086708)
 2011-03-14 17:36:56 -07:00
Gloria Wang
67718e0764 am 132bb659: Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1 
* commit '132bb659b643348f29292810e42800441df41ceb':
  For issue 4082089 Add more info and error events into the DRM framework
 2011-03-14 17:36:42 -07:00
Shailendra Yadav
3fabad87f6 Merge "Fix for Don't allow adding 64-bit files(4086708)" into honeycomb-mr1 2011-03-14 17:23:05 -07:00
Mike Lockwood
015b1ecaec Add support for USB accessory serial numbers 
Change-Id: I47b79f091b300ced60bfc61eff2f771139663aae
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-14 20:10:47 -04:00
Scott Main
5579bb7596 am 5355178a: am 9f3f36c9: am c2366c89: Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb 
* commit '5355178a45bdc286d49f04f90059f1e5d0c41a82':
  docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc
 2011-03-14 17:10:11 -07:00
Scott Main
66f9007dab am c0f3e4f4: am 04e1af80: am 7b013bb5: docs: release notes for ADT 10.0.1 
* commit 'c0f3e4f40e27db549a877777f8ef51522dd97a1d':
  docs: release notes for ADT 10.0.1
 2011-03-14 17:10:09 -07:00
Gloria Wang
132bb659b6 Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1 2011-03-14 17:02:58 -07:00
Scott Main
5355178a45 am 9f3f36c9: am c2366c89: Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb 
* commit '9f3f36c95b87aab2c5f7cd6b6e18927f8ebfa9c4':
  docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc
 2011-03-14 17:02:34 -07:00
Scott Main
c0f3e4f40e am 04e1af80: am 7b013bb5: docs: release notes for ADT 10.0.1 
* commit '04e1af802abfcecda2b86f1a3082a5c806026beb':
  docs: release notes for ADT 10.0.1
 2011-03-14 17:02:31 -07:00
Iliyan Malchev
60fdca229f Merge "frameworks/base: remove LOCAL_PRELINK_MODULE" 2011-03-14 16:58:05 -07:00
Scott Main
9f3f36c95b am c2366c89: Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb 
* commit 'c2366c898abacb4b6e3723f6cad522615a2b304e':
  docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc
 2011-03-14 16:42:28 -07:00
Scott Main
04e1af802a am 7b013bb5: docs: release notes for ADT 10.0.1 
* commit '7b013bb579a9bc372b30e2e520f6e200f6c2b1b9':
  docs: release notes for ADT 10.0.1
 2011-03-14 16:42:17 -07:00
Nicolas Roard
ac1aa45ed9 am 373ece1f: am 65c28204: Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1 
* commit '373ece1fa158d72152712b36674a9c114a40b649':
  Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)
 2011-03-14 16:36:50 -07:00
Xavier Ducrohet
67a2d2ba22 am c192ec26: am 7608181c: am 491ef0c6: Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1 
* commit 'c192ec26c35c045cb2744193f17e2cf5dd809f5e':
  LayoutLib: Fix Arc rendering.
 2011-03-14 16:08:53 -07:00
Neel Parekh
4b7022f1d9 am 4cef246c: am 5b3d18cf: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 
* commit '4cef246c0b43a68d1154172d673852dad7a808e2':
 2011-03-14 16:08:34 -07:00
Nicolas Roard
89843eb93b am a2a72f01: am f146fd9c: Adding placeholders for the fullscreen button used by the browser for HTML5 video 
* commit 'a2a72f01d97ccada0f6b02908066ffb0d3a19a61':
  Adding placeholders for the fullscreen button used by the browser for HTML5 video
 2011-03-14 16:08:29 -07:00
Scott Main
c2366c898a Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb 2011-03-14 16:08:09 -07:00
Scott Main
ae7067f58d docs: update optimization guide with more info 
most importantly, information about using <compatible-screens>
also add sample code to <compatible-screens> doc

Change-Id: I62f6ceee4e358a18f5e513cf54c9c96f27470ae9
 2011-03-14 16:07:26 -07:00
Scott Main
7b013bb579 docs: release notes for ADT 10.0.1 
Change-Id: If2a95c306e935c00944b0722b17b62315625ff93
 2011-03-14 15:46:21 -07:00
Nicolas Roard
373ece1fa1 am 65c28204: Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1 
* commit '65c282042dab1dfa75b10517190ba38834782c3b':
  Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)
 2011-03-14 15:39:37 -07:00
Xavier Ducrohet
c192ec26c3 am 7608181c: am 491ef0c6: Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1 
* commit '7608181ca76eda1ab64661ddae13bbb92e185ae8':
  LayoutLib: Fix Arc rendering.
 2011-03-14 15:29:13 -07:00
Gloria Wang
27b277779c For issue 4082089 
Add more info and error events into the DRM framework

Change-Id: I0bb3251c5947fc8e977d478e1ba46b242cb97e9d
 2011-03-14 15:29:08 -07:00
Neel Parekh
4cef246c0b am 5b3d18cf: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 
* commit '5b3d18cfa2879e47a4d9c06024b81c63c48e41f1':
 2011-03-14 15:29:06 -07:00
Nicolas Roard
a2a72f01d9 am f146fd9c: Adding placeholders for the fullscreen button used by the browser for HTML5 video 
* commit 'f146fd9c2122ac27bc1a70c16864899c94371923':
  Adding placeholders for the fullscreen button used by the browser for HTML5 video
 2011-03-14 15:29:00 -07:00
Nicolas Roard
da9b9b248a am 21f86159: am b6866f81: am 0fd8fa33: Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1 
* commit '21f86159ffa78dd4bd7fec2053dc2413f0cc7288':
  Adding placeholders for the fullscreen button used by the browser for HTML5 video
 2011-03-14 15:27:25 -07:00
Renaud-Roland Hubert
30245f7d4e am 04da3dc6: am 58162eba: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 
* commit '04da3dc67ea9342b0864de684aed2efdd98c2412':
 2011-03-14 15:27:21 -07:00
Jamie Gennis
63fb711c7f am ef1d5f3e: am 21752785: gl2_yuvtex: use the gralloc-provided stride. 
* commit 'ef1d5f3e5ebe7ba927d032f4f6fe82a7552014b0':
  gl2_yuvtex: use the gralloc-provided stride.
 2011-03-14 15:27:14 -07:00
Nicolas Roard
65c282042d Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1 2011-03-14 15:26:58 -07:00
Xavier Ducrohet
7608181ca7 am 491ef0c6: Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1 
* commit '491ef0c6bdaa45201278813bdfbf859801aba655':
  LayoutLib: Fix Arc rendering.
 2011-03-14 15:25:45 -07:00
Neel Parekh
5b3d18cfa2 Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 2011-03-14 15:25:44 -07:00
Nicolas Roard
f146fd9c21 Adding placeholders for the fullscreen button 
used by the browser for HTML5 video

bug:4080127
Change-Id: I8fedef7eb0442de547ff083f15f6fcc7a9fea791
 2011-03-14 15:25:42 -07:00
Jamie Gennis
e65cfd9897 am dcbc2557: am c313b59b: am 071929b2: Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1 
* commit 'dcbc255734e506bacd36d8d9483b7f3d6d96d10b':
  gl2_yuvtex: use the gralloc-provided stride.
 2011-03-14 15:25:14 -07:00
James Wilson
125b5605e9 am 46a36422: am 5efa65d1: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 
* commit '46a3642251b5fd6c37720284108304e69f0f8166':
 2011-03-14 15:25:12 -07:00
Huahui Wu
6306585107 am e7c4b7a7: am cc8fa160: b/3392594 keep the remain touch points when one is ended. 
* commit 'e7c4b7a7d1bf2169250bbc3f0aaa52a464fd8218':
  b/3392594 keep the remain touch points when one is ended.
 2011-03-14 15:25:07 -07:00
Nicolas Roard
21f86159ff am b6866f81: am 0fd8fa33: Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1 
* commit 'b6866f81a945d57390542526b154edae01ee795e':
  Adding placeholders for the fullscreen button used by the browser for HTML5 video
 2011-03-14 15:24:57 -07:00
Renaud-Roland Hubert
04da3dc67e am 58162eba: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 
* commit '58162eba33c287d747ceb4753abf6c3ba4223466':
 2011-03-14 15:24:54 -07:00
Jamie Gennis
ef1d5f3e5e am 21752785: gl2_yuvtex: use the gralloc-provided stride. 
* commit '21752785bae7c1beaf5729e43973bed6b9e14520':
  gl2_yuvtex: use the gralloc-provided stride.
 2011-03-14 15:24:51 -07:00
Xavier Ducrohet
491ef0c6bd Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1 2011-03-14 15:24:20 -07:00
Jamie Gennis
dcbc255734 am c313b59b: am 071929b2: Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1 
* commit 'c313b59b4295c7cfe7f13d635be2c85f9fee7365':
  gl2_yuvtex: use the gralloc-provided stride.
 2011-03-14 15:22:34 -07:00
James Wilson
46a3642251 am 5efa65d1: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 
* commit '5efa65d1948c3396d4f68a64c9fe4788a4ab0d62':
 2011-03-14 15:22:31 -07:00
Huahui Wu
e7c4b7a7d1 am cc8fa160: b/3392594 keep the remain touch points when one is ended. 
* commit 'cc8fa160fbfcd17f369c15a2d33959fbb090ac6e':
  b/3392594 keep the remain touch points when one is ended.
 2011-03-14 15:22:29 -07:00
Huahui Wu
a492e1a14b am ddba200b: am 9691d3f3: am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1 
* commit 'ddba200b425c56b3b66ead23e8d5fd51a17c6cc4':
  b/3392594 keep the remain touch points when one is ended.
 2011-03-14 15:22:12 -07:00
Huahui Wu
f3f1a85c63 am 21e30abf: am f2a9e576: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 
* commit '21e30abf68554bee9cb143e17f3919432b6eb0c9':
 2011-03-14 15:22:08 -07:00
Eric Fischer
909a4c2fbe am a3ef0bb7: (-s ours) am d5e8dae8: Import revised translations. DO NOT MERGE 
* commit 'a3ef0bb7af48525ad8c0064185ba0019298b0675':
  Import revised translations.  DO NOT MERGE
 2011-03-14 15:22:06 -07:00