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

47529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ying Wang
4a223cdde5 Add screen layout size as one of the resource filtering axes. 
So that we can add screen layout size such as
"small/normal/large/xlarge" to PRODUCT_LOCALES to filter unwanted
resources. We already handle screen density this way.
Bug: 4086309

Change-Id: I0867e22a825faea0e100d8a0075f0f5cb7c0c964
 2011-03-14 15:53:23 -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
Xavier Ducrohet
2652b618a8 Merge 6f2fb570 from honeycomb. do not merge. 
LayoutLib: Fix dimension parsing to handle negative value.

Also make TypedArray.getDimensionPixelSize properly
handle negative values (which are not allowed).

Change-Id: I03ffcef5ab7ec7ef95419566776dcc798845fd88
 2011-03-14 15:28:50 -07:00
Xavier Ducrohet
f354ad108c Merge c12b4093 from honeycomb. do not merge. 
Change-Id: Icfbb70c097d87bf92415c6f0534346adde4c02fe
LayoutLib: Implement some missing add###() method in Path.
 2011-03-14 15:28:50 -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
Scott Main
c0c43ce0d7 am c710cf37: am c899d32e: docs: update search dev guide with SearcView widget 
* commit 'c710cf379f61c767d372104a3c9d6142d54aa02f':
  docs: update search dev guide with SearcView widget
 2011-03-14 15:22:03 -07:00
Eric Fischer
a107883d62 am 6617e1fc: am e0b33ce0: Add "new incognito window" translations. 
* commit '6617e1fcb4ffbec4f339e0d6c727643b0c2da1d7':
  Add "new incognito window" translations.
 2011-03-14 15:22:00 -07:00
Nicolas Roard
b6866f81a9 am 0fd8fa33: Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1 
* commit '0fd8fa33e28df28568532c30f53a91a8d652b35d':
  Adding placeholders for the fullscreen button used by the browser for HTML5 video
 2011-03-14 15:21:46 -07:00
Renaud-Roland Hubert
58162eba33 Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 2011-03-14 15:21:44 -07:00
Jamie Gennis
21752785ba gl2_yuvtex: use the gralloc-provided stride. 
This change fixes the gl2_yuvtex test to use the stride chosen by the
gralloc implementation rather than hard-coding it.

Bug: 4081948
Change-Id: If7c96a20fc3fb1df2ff25e6afaa9f34dbad2002c
 2011-03-14 15:21:37 -07:00
Jamie Gennis
c313b59b42 am 071929b2: Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1 
* commit '071929b202404da110c17fad4aba216558e7e785':
  gl2_yuvtex: use the gralloc-provided stride.
 2011-03-14 15:19:31 -07:00
James Wilson
5efa65d194 Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 2011-03-14 15:19:30 -07:00
Scott Main
a51a6beeed am 9e173ece: am 2213a4ac: am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget 
* commit '9e173ececf985c1dcd32e3cc2627499919fc329b':
  docs: update search dev guide with SearcView widget
 2011-03-14 15:19:21 -07:00
Eric Fischer
45b85bf494 am f6c3b32b: am 95176382: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 
* commit 'f6c3b32b5cfcfda257d5825078433d89be80d934':
 2011-03-14 15:19:18 -07:00