ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
32,009 Commits 2 Branches 0 Tags 54 MiB
c0a5e8df03
Commit Graph

32009 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Neel Parekh
c65fa01ede 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
28a615aff5 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
9bc7dc2114 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
b8de36d106 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
a96e85f342 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
579a30dca2 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
40df79ffb6 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
0c2fb9355f Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 2011-03-14 15:25:44 -07:00
Jamie Gennis
5b92e39c14 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
761bc86601 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
0c52c9878c 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
9cca3de381 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
0e69b1364d 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
fee6d64833 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
520eb2f5b5 Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1 2011-03-14 15:24:20 -07:00
Jamie Gennis
22943e256e 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
5c8257a855 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
f8a473e8de 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
16c51acc59 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
ad86182a9d 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
3d27e84cdd 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
29632a4deb 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
7bf0e75a4c 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
8d391b321c 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
93a2b0ee6e 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
b041f67843 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
0cd6caf7a7 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
36e250659a 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
6ecd555801 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
a5b7360b4f 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
65a937994c 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
Eric Fischer
e901940f02 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
b65dc30d05 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
efc7d6eb88 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
7cd6cf9ea5 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
98f2f33fe5 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
a330ca6cd0 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
712a7fb381 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
Eric Fischer
40655edecd am e0b33ce0: Add "new incognito window" translations. 
* commit 'e0b33ce0c3ebdb7aa73af5350bb5bdcd26f59370':
  Add "new incognito window" translations.
 2011-03-14 15:14:22 -07:00
Nicolas Roard
c9eb44612b 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
Scott Main
93e683b4e4 am 2213a4ac: am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget 
* commit '2213a4aca030151f6590a998200daa9865202343':
  docs: update search dev guide with SearcView widget
 2011-03-14 14:59:11 -07:00
Eric Fischer
5486e6dcb7 am 95176382: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 
* commit '951763824168d08d3f54ba22917756d769486b8b':
 2011-03-14 14:58:50 -07:00
Eric Fischer
48456a6bf3 am 9f7b4ba6: Import revised translations. DO NOT MERGE 
* commit '9f7b4ba69ca809d6909b8863d3570f970edcb7bf':
  Import revised translations.  DO NOT MERGE
 2011-03-14 14:58:45 -07:00
Eric Fischer
d1204459c8 am aa3ea7be: Add "new incognito window" translations. 
* commit 'aa3ea7be0c78e8aa5f3a32b0decba03edba00686':
  Add "new incognito window" translations.
 2011-03-14 14:58:39 -07:00
Jamie Gennis
1a4efdc224 Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1 2011-03-14 14:49:37 -07:00
Huahui Wu
48e7f35d10 am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1 
* commit 'b71020ef4018195a21d2538ea3767b901610daf4':
  b/3392594 keep the remain touch points when one is ended.
 2011-03-14 14:46:27 -07:00
Huahui Wu
b8847d1bbb Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 2011-03-14 14:46:26 -07:00
Huahui Wu
b9ab7f5478 Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1 2011-03-14 14:43:46 -07:00
James Dong
ed8d7e66ba Merge "libstagefright: Add error handling in AMRNB deooder" 2011-03-14 14:43:24 -07:00
Scott Main
3758c1b419 am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget 
* commit '462012db70fb73431bb25909d73e45fea9fc5911':
  docs: update search dev guide with SearcView widget
 2011-03-14 14:42:51 -07:00