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

47286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Eric Fischer
0fd4a8a5de am 7e315466: (-s ours) am 9f7b4ba6: Import revised translations. DO NOT MERGE 
* commit '7e315466672b34dab1a85301f4870ddae044a9f3':
  Import revised translations.  DO NOT MERGE
 2011-03-14 15:19:15 -07:00
Huahui Wu
cc8fa160fb b/3392594 keep the remain touch points when one is ended. 
This is the Java side code change for b/3392594.
It adds an action index into the touch event data and pass it
to the native side.

Change-Id: Ibb393e62a590d0fff1dd3172041748e2b10501d6
 2011-03-14 15:19:13 -07:00
Eric Fischer
65baaeb22d am 86fe201b: am aa3ea7be: Add "new incognito window" translations. 
* commit '86fe201baf2164ba981b8932e5c08303c84be2c9':
  Add "new incognito window" translations.
 2011-03-14 15:19:10 -07:00
Eric Fischer
3d44d7c15c am 9ce4370f: (-s ours) am 175121a5: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '9ce4370f39c909324be160464711fedaa0c75606':
  Import revised translations.  DO NOT MERGE
 2011-03-14 15:19:00 -07:00
Eric Fischer
2d59a94716 am 29f10747: am 9f70f526: Merge "Add "new incognito window" translations." into honeycomb-mr1 
* commit '29f107476d577e073748c29a9e31c573620684be':
  Add "new incognito window" translations.
 2011-03-14 15:18:52 -07:00
Huahui Wu
ddba200b42 am 9691d3f3: am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1 
* commit '9691d3f3181e514471383e170684b27330cb5dbb':
  b/3392594 keep the remain touch points when one is ended.
 2011-03-14 15:15:16 -07:00
Huahui Wu
21e30abf68 am f2a9e576: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 
* commit 'f2a9e576d4fb5d028d1acf7344d611c91bb40999':
 2011-03-14 15:15:04 -07:00
Eric Fischer
a3ef0bb7af am d5e8dae8: Import revised translations. DO NOT MERGE 
* commit 'd5e8dae883f8343e7adfb1f4388d742002e5eb8e':
  Import revised translations.  DO NOT MERGE
 2011-03-14 15:14:59 -07:00
Scott Main
c710cf379f am c899d32e: docs: update search dev guide with SearcView widget 
* commit 'c899d32e8be988b46c37206827a0a1a7a4b809a6':
  docs: update search dev guide with SearcView widget
 2011-03-14 15:14:36 -07:00
Nicolas Roard
3efaa34015 Adding placeholders for the large play button 
used by the browser for HTML5 video (the button will appear
surimposed to the video)

bug:4080127
Change-Id: I681d2a4a3de1b2db64ffb3bbf4ce883320c771f1
 2011-03-14 15:14:28 -07:00
Eric Fischer
6617e1fcb4 am e0b33ce0: Add "new incognito window" translations. 
* commit 'e0b33ce0c3ebdb7aa73af5350bb5bdcd26f59370':
  Add "new incognito window" translations.
 2011-03-14 15:14:22 -07:00
Xavier Ducrohet
9d76581faf LayoutLib: Fix Arc rendering. 
Looks like Java2D and Skia go in different directions for angles.

Change-Id: Ia0c9c70cd66c9a0941fa9921fecf8e4e83538af3
 2011-03-14 15:12:21 -07:00
Nicolas Roard
0fd8fa33e2 Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1 2011-03-14 15:11:55 -07:00